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/ipv4/arp.c | |
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/ipv4/arp.c')
-rw-r--r-- | net/ipv4/arp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index b043eda60b04..1a9dd66511fc 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -663,7 +663,7 @@ out: | |||
663 | void arp_xmit(struct sk_buff *skb) | 663 | void arp_xmit(struct sk_buff *skb) |
664 | { | 664 | { |
665 | /* Send it off, maybe filter it using firewalling first. */ | 665 | /* Send it off, maybe filter it using firewalling first. */ |
666 | NF_HOOK(NF_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit); | 666 | NF_HOOK(NFPROTO_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit); |
667 | } | 667 | } |
668 | 668 | ||
669 | /* | 669 | /* |
@@ -928,7 +928,7 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev, | |||
928 | 928 | ||
929 | memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb)); | 929 | memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb)); |
930 | 930 | ||
931 | return NF_HOOK(NF_ARP, NF_ARP_IN, skb, dev, NULL, arp_process); | 931 | return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, skb, dev, NULL, arp_process); |
932 | 932 | ||
933 | freeskb: | 933 | freeskb: |
934 | kfree_skb(skb); | 934 | kfree_skb(skb); |