---

yaml --- r: 143449 b: refs/heads/master c: 1a31f20 h: refs/heads/master i: 143447: 845b186 v: v3
git-mirror · Apr 14, 2009 · 4526c10 · 4526c10
1 parent 3bc57f8
commit 4526c10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1db9e29bb0ff3c9366e8a50fb09ca8dbc364bfd6
+refs/heads/master: 1a31f2042e938f1b467aa3d807cc5666352bf8a3
diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c
@@ -176,8 +176,10 @@ META_COLLECTOR(var_dev)
 
 META_COLLECTOR(int_vlan_tag)
 {
-	unsigned short uninitialized_var(tag);
-	if (vlan_get_tag(skb, &tag) < 0)
+	unsigned short tag;
+
+	tag = vlan_tx_tag_get(skb);
+	if (!tag && __vlan_get_tag(skb, &tag))
 		*err = -1;
 	else
 		dst->value = tag;