Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc9314c authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

netfilter: replace old NF_ARP calls with NFPROTO_ARP 



(Supplements: ee999d8b)

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: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67671841

net/bridge/br_netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff *skb, 
		return NF_ACCEPT;

	}

	*d = (struct net_device *)in;

	NF_HOOK(NF_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in,

	NF_HOOK(NFPROTO_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in,

		(struct net_device *)out, br_nf_forward_finish);



	return NF_STOLEN;

net/ipv4/arp.c

+2 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ out: 
void arp_xmit(struct sk_buff *skb)

{

	/* Send it off, maybe filter it using firewalling first.  */

	NF_HOOK(NF_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit);

	NF_HOOK(NFPROTO_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit);

}



/*
@@ -928,7 +928,7 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev, 


	memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));



	return NF_HOOK(NF_ARP, NF_ARP_IN, skb, dev, NULL, arp_process);

	return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, skb, dev, NULL, arp_process);



freeskb:

	kfree_skb(skb);

net/netfilter/xt_NFQUEUE.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct xt_target nfqueue_tg_reg[] __read_mostly = { 
	},

	{

		.name		= "NFQUEUE",

		.family		= NF_ARP,

		.family		= NFPROTO_ARP,

		.target		= nfqueue_tg,

		.targetsize	= sizeof(struct xt_NFQ_info),

		.me		= THIS_MODULE,