Merge tag 'v3.10.106' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / sched / em_meta.c

diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 7c3de6ffa5164db0f7abd3f0e2cc0ca2e92ecda9..eba9d1e49faf7f91028ff6f20ca98d3e479c8603 100644 (file)
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -176,11 +176,12 @@ META_COLLECTOR(int_vlan_tag)
 {
        unsigned short tag;
 
-       tag = vlan_tx_tag_get(skb);
-       if (!tag && __vlan_get_tag(skb, &tag))
-               *err = -1;
-       else
+       if (vlan_tx_tag_present(skb))
+               dst->value = vlan_tx_tag_get(skb);
+       else if (!__vlan_get_tag(skb, &tag))
                dst->value = tag;
+       else
+               *err = -1;
 }