git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[VLAN]: Turn VLAN_DEV_INFO into inline function
[safe/jmp/linux-2.6]
/
drivers
/
net
/
cxgb3
/
l2t.c
diff --git
a/drivers/net/cxgb3/l2t.c
b/drivers/net/cxgb3/l2t.c
index
d660af7
..
17ed4c3
100644
(file)
--- a/
drivers/net/cxgb3/l2t.c
+++ b/
drivers/net/cxgb3/l2t.c
@@
-337,7
+337,7
@@
struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
atomic_set(&e->refcnt, 1);
neigh_replace(e, neigh);
if (neigh->dev->priv_flags & IFF_802_1Q_VLAN)
- e->vlan =
VLAN_DEV_INFO
(neigh->dev)->vlan_id;
+ e->vlan =
vlan_dev_info
(neigh->dev)->vlan_id;
else
e->vlan = VLAN_NONE;
spin_unlock(&e->lock);