From e5252dcb965881258899441f74192930fbfcfa5c Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 1 Feb 2013 15:18:49 +0000 Subject: [PATCH] --- yaml --- r: 349655 b: refs/heads/master c: 92df9b217ee2392024483ba5b85a88d92d60f3c1 h: refs/heads/master i: 349653: 164fcc00c51f4b49a0dcef651fc434fbdc8dbb6c 349651: 6da190064a55414a2d5932e7a472f3804f41b0af 349647: 8cdae19510bc21fc59f8d4089594dd5e2b585703 v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77227392d16e..00afd8213117 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e5f421211ff76c17130b4597bc06df4eeead24f +refs/heads/master: 92df9b217ee2392024483ba5b85a88d92d60f3c1 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index a9a2ae3e2213..32443ebc3e89 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -683,7 +683,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) new->network_header = old->network_header; new->mac_header = old->mac_header; new->inner_transport_header = old->inner_transport_header; - new->inner_network_header = old->inner_transport_header; + new->inner_network_header = old->inner_network_header; skb_dst_copy(new, old); new->rxhash = old->rxhash; new->ooo_okay = old->ooo_okay;