diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-10-20 06:34:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-20 06:34:51 -0400 |
| commit | fdc9314cbe027281b5440780692105d49b53cf2c (patch) | |
| tree | 2c4107753fd3cc8cd5b31dfb24bfca1e248ec5ce /net/bridge | |
| parent | 67671841dfb82df7a60c46e6fefe813cf57805ff (diff) | |
netfilter: replace old NF_ARP calls with NFPROTO_ARP
(Supplements: ee999d8b9573df1b547aacdc6d79f86eb79c25cd)
NFPROTO_ARP actually has a different value from NF_ARP, so ensure all
callers use the new value so that packets _do_ get delivered to the
registered hooks.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index a4abed5b4c44..fa5cda4e552a 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
| @@ -719,7 +719,7 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff *skb, | |||
| 719 | return NF_ACCEPT; | 719 | return NF_ACCEPT; |
| 720 | } | 720 | } |
| 721 | *d = (struct net_device *)in; | 721 | *d = (struct net_device *)in; |
| 722 | NF_HOOK(NF_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in, | 722 | NF_HOOK(NFPROTO_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in, |
| 723 | (struct net_device *)out, br_nf_forward_finish); | 723 | (struct net_device *)out, br_nf_forward_finish); |
| 724 | 724 | ||
| 725 | return NF_STOLEN; | 725 | return NF_STOLEN; |