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/sky2.c | |
| parent | b5284e5aa94be2f88dc92b29e97aff3da0c45f9f (diff) | |
| download | linux-5c15bdec5c38f4ccf73ef2585fc80a6164de9554.tar.bz2 | |
[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/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 52edbd7ac17e..53839979cfb8 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1053,8 +1053,7 @@ static void sky2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), RX_VLAN_STRIP_OFF); sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), TX_VLAN_TAG_OFF); - if (sky2->vlgrp) - sky2->vlgrp->vlan_devices[vid] = NULL; + vlan_group_set_device(sky2->vlgrp, vid, NULL); netif_tx_unlock_bh(dev); } |