From: David Miller <davem@xxxxxxxxxxxxx> Date: Fri, 02 Jul 2010 22:04:08 -0700 (PDT) > From: kaber@xxxxxxxxx > Date: Fri, 2 Jul 2010 11:52:13 +0200 > >> Please apply or pull from: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git master > > Looks good, pulled, thanks Patrick. The br_netfilter changes don't build against net-next-2.6: net/bridge/br_netfilter.c: In function 'br_nf_pre_routing': net/bridge/br_netfilter.c:558:6: error: 'const struct net_device' has no member named 'br_port' net/bridge/br_netfilter.c:558:6: warning: type defaults to 'int' in declaration of '_________p1' net/bridge/br_netfilter.c:558:6: error: 'const struct net_device' has no member named 'br_port' net/bridge/br_netfilter.c:558:6: error: 'const struct net_device' has no member named 'br_port' net/bridge/br_netfilter.c:558:2: warning: type defaults to 'int' in type name net/bridge/br_netfilter.c:558:4: warning: assignment makes pointer from integer without a cast net/bridge/br_netfilter.c: In function 'br_nf_forward_arp': net/bridge/br_netfilter.c:730:6: error: 'const struct net_device' has no member named 'br_port' net/bridge/br_netfilter.c:730:6: warning: type defaults to 'int' in declaration of '_________p1' The br_port accessors got changed in net-next-2.6, so you have to do it using br_port_get_rcu(netdev) et al. I'll fix this up in the merge commit when I pull. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
