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

Commit 31c7711b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SK_BUFF]: Some more simple skb_reset_network_header conversions 



This time of the type:

 skb->nh.iph = (struct iphdr *)skb->data;

That is completely equivalent to:

 skb->nh.raw = skb->data;

Wonder why people love casts... :-)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4209fb60

net/ieee80211/ieee80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
		skb2->protocol = __constant_htons(ETH_P_802_3);

		skb_reset_mac_header(skb2);

		skb_reset_network_header(skb2);

		/* skb2->nh.raw = skb2->data + ETH_HLEN; */

		/* skb2->nh.raw += ETH_HLEN; */

		dev_queue_xmit(skb2);

	}

#endif

net/ipv4/ipmr.c

+2 −2
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ int pim_rcv_v1(struct sk_buff * skb) 


	skb->mac.raw = skb->nh.raw;

	skb_pull(skb, (u8*)encap - skb->data);

	skb->nh.iph = (struct iphdr *)skb->data;

	skb_reset_network_header(skb);

	skb->dev = reg_dev;

	skb->protocol = htons(ETH_P_IP);

	skb->ip_summed = 0;
@@ -1509,7 +1509,7 @@ static int pim_rcv(struct sk_buff * skb) 


	skb->mac.raw = skb->nh.raw;

	skb_pull(skb, (u8*)encap - skb->data);

	skb->nh.iph = (struct iphdr *)skb->data;

	skb_reset_network_header(skb);

	skb->dev = reg_dev;

	skb->protocol = htons(ETH_P_IP);

	skb->ip_summed = 0;

net/sctp/input.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info) 
	/* Fix up skb to look at the embedded net header. */

	saveip = skb->nh.raw;

	savesctp  = skb->h.raw;

	skb->nh.iph = iph;

	skb_reset_network_header(skb);

	skb->h.raw = (char *)sh;

	sk = sctp_err_lookup(AF_INET, skb, sh, &asoc, &transport);

	/* Put back, the original pointers. */