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/atl1 | |
| parent | b5284e5aa94be2f88dc92b29e97aff3da0c45f9f (diff) | |
| download | kernel_samsung_smdk4412-5c15bdec5c38f4ccf73ef2585fc80a6164de9554.zip kernel_samsung_smdk4412-5c15bdec5c38f4ccf73ef2585fc80a6164de9554.tar.gz kernel_samsung_smdk4412-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/atl1')
| -rw-r--r-- | drivers/net/atl1/atl1_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c index 6567348..88d4f70 100644 --- a/drivers/net/atl1/atl1_main.c +++ b/drivers/net/atl1/atl1_main.c @@ -1252,8 +1252,7 @@ static void atl1_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) spin_lock_irqsave(&adapter->lock, flags); /* atl1_irq_disable(adapter); */ - if (adapter->vlgrp) - adapter->vlgrp->vlan_devices[vid] = NULL; + vlan_group_set_device(adapter->vlgrp, vid, NULL); /* atl1_irq_enable(adapter); */ spin_unlock_irqrestore(&adapter->lock, flags); /* We don't do Vlan filtering */ @@ -1266,7 +1265,7 @@ static void atl1_restore_vlan(struct atl1_adapter *adapter) if (adapter->vlgrp) { u16 vid; for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) { - if (!adapter->vlgrp->vlan_devices[vid]) + if (!vlan_group_get_device(adapter->vlgrp, vid)) continue; atl1_vlan_rx_add_vid(adapter->netdev, vid); } |