diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
| commit | 1111b680d34bc19190f02a1b4479c3fcc592c22e (patch) | |
| tree | 9d45ad88b9354205a2d1fd76a338ab8693a16d86 /net/core/dev.c | |
| parent | 37b6cb475a6d74bc047c53bc323d6eb3113e27a4 (diff) | |
| parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 14dac0654f2..5b3042e69f8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2284,7 +2284,7 @@ EXPORT_SYMBOL(skb_checksum_help); __be16 skb_network_protocol(struct sk_buff *skb, int *depth) { __be16 type = skb->protocol; - int vlan_depth = ETH_HLEN; + int vlan_depth = skb->mac_len; /* Tunnel gso handlers can set protocol to ethernet. */ if (type == htons(ETH_P_TEB)) { |