diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-14 11:22:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-14 11:22:09 +0100 |
| commit | 3c729b4344456ebd520636563c854090e3dec611 (patch) | |
| tree | 6caae9f4d4c9f9ae2e033d64486649c6f603a209 /net/core/dev.c | |
| parent | 90438c4bf987a653ad8679a4fa25a909f0c642b5 (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | linux-stable-3c729b4344456ebd520636563c854090e3dec611.tar.gz linux-stable-3c729b4344456ebd520636563c854090e3dec611.tar.bz2 linux-stable-3c729b4344456ebd520636563c854090e3dec611.zip | |
Merge tag 'v3.11-rc5' into spi-s3c64xx
Linux 3.11-rc5
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a3d8d44cb7f4..26755dd40daa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3580,8 +3580,15 @@ ncls: } } - if (vlan_tx_nonzero_tag_present(skb)) - skb->pkt_type = PACKET_OTHERHOST; + if (unlikely(vlan_tx_tag_present(skb))) { + if (vlan_tx_tag_get_id(skb)) + skb->pkt_type = PACKET_OTHERHOST; + /* Note: we might in the future use prio bits + * and set skb->priority like in vlan_do_receive() + * For the time being, just ignore Priority Code Point + */ + skb->vlan_tci = 0; + } /* deliver only exact match when indicated */ null_or_dev = deliver_exact ? skb->dev : NULL; |