diff options
| author | Dan Aloni <da-x@monatomic.org> | 2007-03-02 20:44:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-03-02 20:44:51 -0800 |
| commit | 5c15bdec5c38f4ccf73ef2585fc80a6164de9554 (patch) | |
| tree | c99084e96238eb9ce40e8d9d90e0097c4e92111d /drivers/net/typhoon.c | |
| parent | b5284e5aa94be2f88dc92b29e97aff3da0c45f9f (diff) | |
| download | op-kernel-dev-5c15bdec5c38f4ccf73ef2585fc80a6164de9554.zip op-kernel-dev-5c15bdec5c38f4ccf73ef2585fc80a6164de9554.tar.gz | |
[VLAN]: Avoid a 4-order allocation.
This patch splits the vlan_group struct into a multi-allocated struct. On
x86_64, the size of the original struct is a little more than 32KB, causing
a 4-order allocation, which is prune to problems caused by buddy-system
external fragmentation conditions.
I couldn't just use vmalloc() because vfree() cannot be called in the
softirq context of the RCU callback.
Signed-off-by: Dan Aloni <da-x@monatomic.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 9781b16..0d91d09 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -746,8 +746,7 @@ typhoon_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) { struct typhoon *tp = netdev_priv(dev); spin_lock_bh(&tp->state_lock); - if(tp->vlgrp) - tp->vlgrp->vlan_devices[vid] = NULL; + vlan_group_set_device(tp->vlgrp, vid, NULL); spin_unlock_bh(&tp->state_lock); } |
