Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: 4.19.67 #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: 4.19.67 #2

wants to merge 3 commits into from

Conversation

sdelafond
Copy link
Member

@bmastbergen I've ported most of our patchset from 4.9 to 4.19 (intentionally leaving out i40e patches for now, as they're more involved but won't prevent basic 4.19+Untangle testing), but I'm hitting some incompatible pointer type errors:

/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/net/bridge/br_nf_core.c: In function ‘nf_bridge_alloc’:                                                                                                                                                                      
/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/net/bridge/br_nf_core.c:34:36: error: passing argument 1 of ‘atomic_set’ from incompatible pointer type [-Werror=incompatible-pointer-types]                                                                                 
                         atomic_set(&(skb->nf_bridge->use), 1);                                                                                                                                                                                                                                                                
                                    ^~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                                                                                                                                     
In file included from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/arch/x86/include/asm/atomic.h:265,                                                                                                                                                                     
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/arch/x86/include/asm/msr.h:67,                                                                                                                                                                         
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/arch/x86/include/asm/processor.h:21,                                                                                                                                                                   
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/arch/x86/include/asm/cpufeature.h:5,                                                                                                                                                                   
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/arch/x86/include/asm/thread_info.h:53,                                                                                                                                                                 
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/thread_info.h:38,                                                                                                                                                                        
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/arch/x86/include/asm/preempt.h:7,                                                                                                                                                                      
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/preempt.h:81,                                                                                                                                                                            
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/spinlock.h:51,                                                                                                                                                                           
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/seqlock.h:36,                                                                                                                                                                            
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/time.h:6,                                                                                                                                                                                
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/stat.h:19,                                                                                                                                                                               
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/linux/module.h:10,                                                                                                                                                                             
                 from /home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/net/bridge/br_nf_core.c:17:                                                                                                                                                                            
/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/include/asm-generic/atomic-instrumented.h:31:50: note: expected ‘atomic_t *’ {aka ‘struct <anonymous> *’} but argument is of type ‘refcount_t *’ {aka ‘struct refcount_struct *’}                                            
 static __always_inline void atomic_set(atomic_t *v, int i)                                                                                                                                                                                                                                                                    
                                        ~~~~~~~~~~^                                                                                                                                                                                                                                                                            
/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/net/bridge/br_nf_core.c: In function ‘br_fdb_get’:                                                                                                                                                                           
/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/net/bridge/br_nf_core.c:115:8: error: implicit declaration of function ‘__br_fdb_get’; did you mean ‘br_fdb_get’? [-Werror=implicit-function-declaration]                                                                    
  fdb = __br_fdb_get(br, addr, 0 /* vid ??? FIXME */ );                                                                                                                                                                                                                                                                        
        ^~~~~~~~~~~~                                                                                                                                                                                                                                                                                                           
        br_fdb_get                                                                                                                                                                                                                                                                                                             
/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/net/bridge/br_nf_core.c:115:6: warning: assignment to ‘struct net_bridge_fdb_entry *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]                                                                
  fdb = __br_fdb_get(br, addr, 0 /* vid ??? FIXME */ );                                                                                                                                                                                                                                                                        
      ^                                                                                                                                                                                                                                                                                                                        
cc1: some warnings being treated as errors                                                                                                                                                                                                                                                                                     
make[7]: *** [/home/seb/work/untangle/vcs/ngfw_kernels/debian-4.19.0/linux-4.19.67/debian/build/source_untangle/scripts/Makefile.build:308: net/bridge/br_nf_core.o] Error 1

Could you give it a quick look and tell me if this easily fixable ?

sdelafond added a commit that referenced this pull request Dec 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants