diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-15 10:52:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-15 10:52:27 +0200 |
| commit | af4733b50b52d6112c15a2f0253954fc244a81ca (patch) | |
| tree | c6f66d38c248796cdd5f44ba6d66279faaf07769 /net/core/dev.c | |
| parent | 42108afdd3ce3010ed1e7ff613cc97d024807e99 (diff) | |
| parent | d7892a4c389d54bccb9bce8e65eb053a33bbe290 (diff) | |
Merge tag 'v3.14.22' into linux-linaro-lsk-v3.14
This is the 3.14.22 stable release
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 37bddf729e77..3ed11a555834 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3554,7 +3554,7 @@ another_round: if (skb->protocol == cpu_to_be16(ETH_P_8021Q) || skb->protocol == cpu_to_be16(ETH_P_8021AD)) { - skb = vlan_untag(skb); + skb = skb_vlan_untag(skb); if (unlikely(!skb)) goto unlock; } |