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

Commit 5d877d87 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: decnet: use NFPROTO values for NF_HOOK invocation 



The semantic patch used was:
// <smpl>
@@
@@
 NF_HOOK(
-PF_DECnet,
+NFPROTO_DECNET,
 ...)
// </smpl>

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent b2e0b385

net/decnet/dn_neigh.c

+6 −3
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ static int dn_long_output(struct sk_buff *skb) 


	skb_reset_network_header(skb);



	return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, skb, NULL,

		       neigh->dev, dn_neigh_output_packet);

}



static int dn_short_output(struct sk_buff *skb)
@@ -304,7 +305,8 @@ static int dn_short_output(struct sk_buff *skb) 


	skb_reset_network_header(skb);



	return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, skb, NULL,

		       neigh->dev, dn_neigh_output_packet);

}



/*
@@ -346,7 +348,8 @@ static int dn_phase3_output(struct sk_buff *skb) 


	skb_reset_network_header(skb);



	return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, skb, NULL,

		       neigh->dev, dn_neigh_output_packet);

}



/*

net/decnet/dn_nsp_in.c

+2 −1
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ static int dn_nsp_rx_packet(struct sk_buff *skb) 


int dn_nsp_rx(struct sk_buff *skb)

{

	return NF_HOOK(PF_DECnet, NF_DN_LOCAL_IN, skb, skb->dev, NULL, dn_nsp_rx_packet);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_IN, skb, skb->dev, NULL,

		       dn_nsp_rx_packet);

}



/*

net/decnet/dn_route.c

+20 −8
Original line number Diff line number Diff line
@@ -517,7 +517,8 @@ static int dn_route_rx_long(struct sk_buff *skb) 
	ptr++;

	cb->hops = *ptr++; /* Visit Count */



	return NF_HOOK(PF_DECnet, NF_DN_PRE_ROUTING, skb, skb->dev, NULL, dn_route_rx_packet);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING, skb, skb->dev, NULL,

		       dn_route_rx_packet);



drop_it:

	kfree_skb(skb);
@@ -543,7 +544,8 @@ static int dn_route_rx_short(struct sk_buff *skb) 
	ptr += 2;

	cb->hops = *ptr & 0x3f;



	return NF_HOOK(PF_DECnet, NF_DN_PRE_ROUTING, skb, skb->dev, NULL, dn_route_rx_packet);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING, skb, skb->dev, NULL,

		       dn_route_rx_packet);



drop_it:

	kfree_skb(skb);
@@ -645,16 +647,24 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type 


		switch(flags & DN_RT_CNTL_MSK) {

			case DN_RT_PKT_HELO:

				return NF_HOOK(PF_DECnet, NF_DN_HELLO, skb, skb->dev, NULL, dn_route_ptp_hello);

				return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,

					       skb, skb->dev, NULL,

					       dn_route_ptp_hello);



			case DN_RT_PKT_L1RT:

			case DN_RT_PKT_L2RT:

				return NF_HOOK(PF_DECnet, NF_DN_ROUTE, skb, skb->dev, NULL, dn_route_discard);

				return NF_HOOK(NFPROTO_DECNET, NF_DN_ROUTE,

					       skb, skb->dev, NULL,

					       dn_route_discard);

			case DN_RT_PKT_ERTH:

				return NF_HOOK(PF_DECnet, NF_DN_HELLO, skb, skb->dev, NULL, dn_neigh_router_hello);

				return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,

					       skb, skb->dev, NULL,

					       dn_neigh_router_hello);



			case DN_RT_PKT_EEDH:

				return NF_HOOK(PF_DECnet, NF_DN_HELLO, skb, skb->dev, NULL, dn_neigh_endnode_hello);

				return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,

					       skb, skb->dev, NULL,

					       dn_neigh_endnode_hello);

		}

	} else {

		if (dn->parms.state != DN_DEV_S_RU)
@@ -703,7 +713,8 @@ static int dn_output(struct sk_buff *skb) 
	cb->rt_flags |= DN_RT_F_IE;

	cb->hops = 0;



	return NF_HOOK(PF_DECnet, NF_DN_LOCAL_OUT, skb, NULL, dev, neigh->output);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_OUT, skb, NULL, dev,

		       neigh->output);



error:

	if (net_ratelimit())
@@ -752,7 +763,8 @@ static int dn_forward(struct sk_buff *skb) 
	if (rt->rt_flags & RTCF_DOREDIRECT)

		cb->rt_flags |= DN_RT_F_IE;



	return NF_HOOK(PF_DECnet, NF_DN_FORWARD, skb, dev, skb->dev, neigh->output);

	return NF_HOOK(NFPROTO_DECNET, NF_DN_FORWARD, skb, dev, skb->dev,

		       neigh->output);



drop:

	kfree_skb(skb);