diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-06-01 12:44:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-06-03 11:44:20 -0400 |
commit | cb434e380d58d3956c75dc5ead00eced599b9d16 (patch) | |
tree | 9c1a412297adad8e8b9d8b737a7460897e47c375 | |
parent | 7b332244a63dc1f408fd2ebb2636d58ac69a4916 (diff) |
atl1: eliminate unneeded kill_vid code
This driver has unneeded stubs for VLAN filtering.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/atl1/atl1_main.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c index 78cf00ff3d38..6862c11ff864 100644 --- a/drivers/net/atl1/atl1_main.c +++ b/drivers/net/atl1/atl1_main.c | |||
@@ -1229,39 +1229,9 @@ static void atl1_vlan_rx_register(struct net_device *netdev, | |||
1229 | spin_unlock_irqrestore(&adapter->lock, flags); | 1229 | spin_unlock_irqrestore(&adapter->lock, flags); |
1230 | } | 1230 | } |
1231 | 1231 | ||
1232 | /* FIXME: justify or remove -- CHS */ | ||
1233 | static void atl1_vlan_rx_add_vid(struct net_device *netdev, u16 vid) | ||
1234 | { | ||
1235 | /* We don't do Vlan filtering */ | ||
1236 | return; | ||
1237 | } | ||
1238 | |||
1239 | /* FIXME: this looks wrong too -- CHS */ | ||
1240 | static void atl1_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) | ||
1241 | { | ||
1242 | struct atl1_adapter *adapter = netdev_priv(netdev); | ||
1243 | unsigned long flags; | ||
1244 | |||
1245 | spin_lock_irqsave(&adapter->lock, flags); | ||
1246 | /* atl1_irq_disable(adapter); */ | ||
1247 | vlan_group_set_device(adapter->vlgrp, vid, NULL); | ||
1248 | /* atl1_irq_enable(adapter); */ | ||
1249 | spin_unlock_irqrestore(&adapter->lock, flags); | ||
1250 | /* We don't do Vlan filtering */ | ||
1251 | return; | ||
1252 | } | ||
1253 | |||
1254 | static void atl1_restore_vlan(struct atl1_adapter *adapter) | 1232 | static void atl1_restore_vlan(struct atl1_adapter *adapter) |
1255 | { | 1233 | { |
1256 | atl1_vlan_rx_register(adapter->netdev, adapter->vlgrp); | 1234 | atl1_vlan_rx_register(adapter->netdev, adapter->vlgrp); |
1257 | if (adapter->vlgrp) { | ||
1258 | u16 vid; | ||
1259 | for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) { | ||
1260 | if (!vlan_group_get_device(adapter->vlgrp, vid)) | ||
1261 | continue; | ||
1262 | atl1_vlan_rx_add_vid(adapter->netdev, vid); | ||
1263 | } | ||
1264 | } | ||
1265 | } | 1235 | } |
1266 | 1236 | ||
1267 | static u16 tpd_avail(struct atl1_tpd_ring *tpd_ring) | 1237 | static u16 tpd_avail(struct atl1_tpd_ring *tpd_ring) |
@@ -2203,8 +2173,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
2203 | netdev->poll_controller = atl1_poll_controller; | 2173 | netdev->poll_controller = atl1_poll_controller; |
2204 | #endif | 2174 | #endif |
2205 | netdev->vlan_rx_register = atl1_vlan_rx_register; | 2175 | netdev->vlan_rx_register = atl1_vlan_rx_register; |
2206 | netdev->vlan_rx_add_vid = atl1_vlan_rx_add_vid; | 2176 | |
2207 | netdev->vlan_rx_kill_vid = atl1_vlan_rx_kill_vid; | ||
2208 | netdev->ethtool_ops = &atl1_ethtool_ops; | 2177 | netdev->ethtool_ops = &atl1_ethtool_ops; |
2209 | adapter->bd_number = cards_found; | 2178 | adapter->bd_number = cards_found; |
2210 | adapter->pci_using_64 = pci_using_64; | 2179 | adapter->pci_using_64 = pci_using_64; |