diff options
| author | Timo Teras <timo.teras@iki.fi> | 2008-01-11 01:30:35 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-06 11:43:42 -0800 |
| commit | 596bc9331ee5fa74fda7e276b5a001b789ae644c (patch) | |
| tree | a71a4517dac59f39da26a844f7a53439e4f81c75 | |
| parent | 498d03afccc265dafe8b445454e1a49be3f1358c (diff) | |
| download | lwn-596bc9331ee5fa74fda7e276b5a001b789ae644c.tar.gz lwn-596bc9331ee5fa74fda7e276b5a001b789ae644c.zip | |
IPV4: ip_gre: set mac_header correctly in receive path
[IPV4] ip_gre: set mac_header correctly in receive path
[ Upstream commit: 1d0691674764098304ae4c63c715f5883b4d3784 ]
mac_header update in ipgre_recv() was incorrectly changed to
skb_reset_mac_header() when it was introduced.
Signed-off-by: Timo Teras <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 63282934725e..724b6123b5fd 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -613,7 +613,7 @@ static int ipgre_rcv(struct sk_buff *skb) offset += 4; } - skb_reset_mac_header(skb); + skb->mac_header = skb->network_header; __pskb_pull(skb, offset); skb_reset_network_header(skb); skb_postpull_rcsum(skb, skb_transport_header(skb), offset); |