projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2...
[linux-2.6]
/
drivers
/
net
/
tehuti.c
diff --git
a/drivers/net/tehuti.c
b/drivers/net/tehuti.c
index
432e837
..
91f9054
100644
(file)
--- a/
drivers/net/tehuti.c
+++ b/
drivers/net/tehuti.c
@@
-1165,7
+1165,7
@@
NETIF_RX_MUX(struct bdx_priv *priv, u32 rxd_val1, u16 rxd_vlan,
GET_RXD_VLAN_ID(rxd_vlan))->name);
/* NAPI variant of receive functions */
vlan_hwaccel_receive_skb(skb, priv->vlgrp,
- GET_RXD_VLAN_
ID
(rxd_vlan));
+ GET_RXD_VLAN_
TCI
(rxd_vlan));
} else {
netif_receive_skb(skb);
}