diff options
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 | ||||
| -rw-r--r-- | net/ipv4/arp.c | 4 | ||||
| -rw-r--r-- | net/netfilter/xt_NFQUEUE.c | 2 |
3 files changed, 4 insertions, 4 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; |
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); |
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c index 2cc1fff49307..f9977b3311f7 100644 --- a/net/netfilter/xt_NFQUEUE.c +++ b/net/netfilter/xt_NFQUEUE.c | |||
| @@ -48,7 +48,7 @@ static struct xt_target nfqueue_tg_reg[] __read_mostly = { | |||
| 48 | }, | 48 | }, |
| 49 | { | 49 | { |
| 50 | .name = "NFQUEUE", | 50 | .name = "NFQUEUE", |
| 51 | .family = NF_ARP, | 51 | .family = NFPROTO_ARP, |
| 52 | .target = nfqueue_tg, | 52 | .target = nfqueue_tg, |
| 53 | .targetsize = sizeof(struct xt_NFQ_info), | 53 | .targetsize = sizeof(struct xt_NFQ_info), |
| 54 | .me = THIS_MODULE, | 54 | .me = THIS_MODULE, |
