mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-09 14:43:16 +00:00
[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>
This commit is contained in:
parent
1d06916747
commit
c6e6ca712b
@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
|
|||||||
}
|
}
|
||||||
|
|
||||||
skb_pull(skb, 1); /* Remove PID */
|
skb_pull(skb, 1); /* Remove PID */
|
||||||
skb_reset_mac_header(skb);
|
skb->mac_header = skb->network_header;
|
||||||
skb_reset_network_header(skb);
|
skb_reset_network_header(skb);
|
||||||
skb->dev = ax25->ax25_dev->dev;
|
skb->dev = ax25->ax25_dev->dev;
|
||||||
skb->pkt_type = PACKET_HOST;
|
skb->pkt_type = PACKET_HOST;
|
||||||
|
@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
|
|||||||
|
|
||||||
/* Spoof incoming device */
|
/* Spoof incoming device */
|
||||||
skb->dev = dev;
|
skb->dev = dev;
|
||||||
skb_reset_mac_header(skb);
|
skb->mac_header = skb->network_header;
|
||||||
skb_reset_network_header(skb);
|
skb_reset_network_header(skb);
|
||||||
skb->pkt_type = PACKET_HOST;
|
skb->pkt_type = PACKET_HOST;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user