diff options
| author | Timo Teras <timo.teras@iki.fi> | 2007-12-20 00:10:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-12-20 00:10:33 -0800 |
| commit | 1d0691674764098304ae4c63c715f5883b4d3784 (patch) | |
| tree | 37f3804b70ded513a0e8f1865bc64a6588354925 | |
| parent | 5951cab136d8b7e84696061dc2e69c402bc94f61 (diff) | |
| download | blackbird-op-linux-1d0691674764098304ae4c63c715f5883b4d3784.tar.gz blackbird-op-linux-1d0691674764098304ae4c63c715f5883b4d3784.zip | |
[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: Timo Teras <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 02b02a8d681c..4b93f32de10d 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); |
