aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/starfire.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-04 13:16:49 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-04 13:16:49 -0800
commit6d04e3b04b6ab569cabeb5ca28ad1be11777e895 (patch)
treeaaee636d71492f36fdef9977488c85a64063f8c4 /drivers/net/starfire.c
parent42270035c6550101f7dc742a630c2590dd2d3ae0 (diff)
parent5c15bdec5c38f4ccf73ef2585fc80a6164de9554 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [VLAN]: Avoid a 4-order allocation. [HDLC] Fix dev->header_cache_update having a random value. [NetLabel]: Verify sensitivity level has a valid CIPSO mapping [PPPOE]: Key connections properly on local device. [AF_UNIX]: Test against sk_max_ack_backlog properly. [NET]: Fix bugs in "Whether sock accept queue is full" checking
Diffstat (limited to 'drivers/net/starfire.c')
-rw-r--r--drivers/net/starfire.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index bf873ea2579..8bba2e3da7e 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -677,8 +677,7 @@ static void netdev_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
spin_lock(&np->lock);
if (debug > 1)
printk("%s: removing vlanid %d from vlan filter\n", dev->name, vid);
- if (np->vlgrp)
- np->vlgrp->vlan_devices[vid] = NULL;
+ vlan_group_set_device(np->vlgrp, vid, NULL);
set_rx_mode(dev);
spin_unlock(&np->lock);
}
@@ -1738,7 +1737,7 @@ static void set_rx_mode(struct net_device *dev)
int vlan_count = 0;
void __iomem *filter_addr = ioaddr + HashTable + 8;
for (i = 0; i < VLAN_VID_MASK; i++) {
- if (np->vlgrp->vlan_devices[i]) {
+ if (vlan_group_get_device(np->vlgrp, i)) {
if (vlan_count >= 32)
break;
writew(cpu_to_be16(i), filter_addr);