netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick McHardy <kaber@trash.net>
To: David Miller <davem@davemloft.net>
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH 0/9] netfilter: netfilter update
Date: Sat, 03 Jul 2010 11:06:30 +0200	[thread overview]
Message-ID: <4C2EFD96.1040907@trash.net> (raw)
In-Reply-To: <20100702.224434.226764333.davem@davemloft.net>

David Miller wrote:
> From: David Miller <davem@davemloft.net>
> 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.
>   

Sorry, I added that patch to my tree after testing based on a merge
with net-next and forgot to retest.

> I'll fix this up in the merge commit when I pull.
>   

Thanks!


      reply	other threads:[~2010-07-03  9:06 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-02  9:52 [PATCH 0/9] netfilter: netfilter update kaber
2010-07-02  9:52 ` [PATCH 1/9] netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN kaber
2010-07-02 10:14   ` Jan Engelhardt
2010-07-02 10:17     ` Patrick McHardy
2010-07-02 12:17       ` Jan Engelhardt
2010-07-02 12:35         ` Patrick McHardy
2010-07-02 12:58           ` Jan Engelhardt
2010-07-02 14:07             ` Patrick McHardy
2010-07-02  9:52 ` [PATCH 2/9] IPVS: one-packet scheduling kaber
2010-07-02  9:52 ` [PATCH 3/9] netfilter: xt_IDLETIMER needs kdev_t.h kaber
2010-07-02  9:52 ` [PATCH 4/9] netfilter: fix simple typo in KConfig for netfiltert xt_TEE kaber
2010-07-02  9:52 ` [PATCH 5/9] netfilter: xt_connbytes: Force CT accounting to be enabled kaber
2010-07-02  9:52 ` [PATCH 6/9] netfilter: complete the deprecation of CONFIG_NF_CT_ACCT kaber
2010-07-02  9:52 ` [PATCH 7/9] netfilter: ipt_LOG/ip6t_LOG: remove comparison within loop kaber
2010-07-02  9:52 ` [PATCH 8/9] netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC header kaber
2010-07-02  9:52 ` [PATCH 9/9] bridge: add per bridge device controls for invoking iptables kaber
2010-07-03  5:04 ` [PATCH 0/9] netfilter: netfilter update David Miller
2010-07-03  5:44   ` David Miller
2010-07-03  9:06     ` Patrick McHardy [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C2EFD96.1040907@trash.net \
    --to=kaber@trash.net \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).