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

Commit 1d069167 authored by Timo Teras's avatar Timo Teras Committed by David S. Miller
Browse files

[IPV4] ip_gre: set mac_header correctly in receive path 



mac_header update in ipgre_recv() was incorrectly changed to
skb_reset_mac_header() when it was introduced.

Signed-off-by: default avatarTimo Teras <timo.teras@iki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5951cab1

net/ipv4/ip_gre.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -613,7 +613,7 @@ static int ipgre_rcv(struct sk_buff *skb) 
				offset += 4;

				offset += 4;

		}

		}





		skb_reset_mac_header(skb);

		skb->mac_header = skb->network_header;

		__pskb_pull(skb, offset);

		__pskb_pull(skb, offset);

		skb_reset_network_header(skb);

		skb_reset_network_header(skb);

		skb_postpull_rcsum(skb, skb_transport_header(skb), offset);

		skb_postpull_rcsum(skb, skb_transport_header(skb), offset);