From 942078a9623c0c9ae7b86268360cec541318d19c Mon Sep 17 00:00:00 2001 From: Li RongQing Date: Mon, 11 Mar 2013 20:30:44 +0000 Subject: [PATCH] --- yaml --- r: 361433 b: refs/heads/master c: c80a8512ee3a8e1f7c3704140ea55f21dc6bd651 h: refs/heads/master i: 361431: a22ab0f7f4b97cfc4f09d0263c80168d6777598b v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0a904745ccaf..05ba4631fec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45549a68a592dd1daed72aaf4df2295931b93138 +refs/heads/master: c80a8512ee3a8e1f7c3704140ea55f21dc6bd651 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index dffbef70cd31..d540ced1f6c6 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2219,9 +2219,9 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb, struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); struct packet_offload *ptype; __be16 type = skb->protocol; + int vlan_depth = ETH_HLEN; while (type == htons(ETH_P_8021Q)) { - int vlan_depth = ETH_HLEN; struct vlan_hdr *vh; if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))