From 4526c1006260624decc3c81b9a6634d279d7d108 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 13 Apr 2009 18:12:57 -0700
Subject: [PATCH] --- yaml --- r: 143449 b: refs/heads/master c:
 1a31f2042e938f1b467aa3d807cc5666352bf8a3 h: refs/heads/master i:   143447:
 845b1868305b9280eb90ff8ebcf05271c3e08146 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/em_meta.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 182e076ce1f2..8f7ff6c1d45c 100644
--- 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
index 72cf86e3c090..fad596bf32d7 100644
--- 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;