diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-17 02:35:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-17 02:35:26 +0200 |
| commit | a54bfa40fd16aeb90bc556189221576f746f8567 (patch) | |
| tree | 176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 /net/sched/em_meta.c | |
| parent | fec: call fec_restart() in fec_open() (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| download | linux-a54bfa40fd16aeb90bc556189221576f746f8567.tar.xz linux-a54bfa40fd16aeb90bc556189221576f746f8567.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sched/em_meta.c')
| -rw-r--r-- | net/sched/em_meta.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 72cf86e3c090..fad596bf32d7 100644 --- a/net/sched/em_meta.c +++ b/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; |