Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa

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;