From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH 0/9] netfilter: netfilter update Date: Fri, 02 Jul 2010 22:44:34 -0700 (PDT) Message-ID: <20100702.224434.226764333.davem@davemloft.net> References: <1278064342-19059-1-git-send-email-kaber@trash.net> <20100702.220408.112596216.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org To: kaber@trash.net Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:49788 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752742Ab0GCFoV (ORCPT ); Sat, 3 Jul 2010 01:44:21 -0400 In-Reply-To: <20100702.220408.112596216.davem@davemloft.net> Sender: netfilter-devel-owner@vger.kernel.org List-ID: From: David Miller Date: Fri, 02 Jul 2010 22:04:08 -0700 (PDT) > From: kaber@trash.net > 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.