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

Commit c6e6ca71 authored Dec 20, 2007 by David S. Miller

[NET]: Correct two mistaken skb_reset_mac_header() conversions.



This operation helper abstracts:

	skb->mac_header = skb->data;

but it was done in two more places which were actually:

	skb->mac_header = skb->network_header;

and those are corrected here.

Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1d069167

net/ax25/ax25_in.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb ax25, struct sk_buff skb)
		}

		skb_pull(skb, 1); /* Remove PID */
		skb_reset_mac_header(skb);
		skb->mac_header = skb->network_header;
		skb_reset_network_header(skb);
		skb->dev = ax25->ax25_dev->dev;
		skb->pkt_type = PACKET_HOST;

net/netrom/nr_dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff skb, struct net_device dev)

		/* Spoof incoming device */
		skb->dev = dev;
		skb_reset_mac_header(skb);
		skb->mac_header = skb->network_header;
		skb_reset_network_header(skb);
		skb->pkt_type = PACKET_HOST;