diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 13:16:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 13:16:49 -0800 |
| commit | 6d04e3b04b6ab569cabeb5ca28ad1be11777e895 (patch) | |
| tree | aaee636d71492f36fdef9977488c85a64063f8c4 /drivers/net/8139cp.c | |
| parent | 42270035c6550101f7dc742a630c2590dd2d3ae0 (diff) | |
| parent | 5c15bdec5c38f4ccf73ef2585fc80a6164de9554 (diff) | |
| download | kernel-crypto-6d04e3b04b6ab569cabeb5ca28ad1be11777e895.tar.gz kernel-crypto-6d04e3b04b6ab569cabeb5ca28ad1be11777e895.tar.xz kernel-crypto-6d04e3b04b6ab569cabeb5ca28ad1be11777e895.zip | |
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/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 6f93a765e56..12c8453f44b 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -448,8 +448,7 @@ static void cp_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) spin_lock_irqsave(&cp->lock, flags); cp->cpcmd &= ~RxVlanOn; cpw16(CpCmd, cp->cpcmd); - if (cp->vlgrp) - cp->vlgrp->vlan_devices[vid] = NULL; + vlan_group_set_device(cp->vlgrp, vid, NULL); spin_unlock_irqrestore(&cp->lock, flags); } #endif /* CP_VLAN_TAG_USED */ |