Skip to contentSkip to conversation

VLAN driver API fixes

PATCH Patrick McHardy 3 participants 3 messages Jun 1, 2007 – Jun 3, 2007 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 4 lines · Stephen Hemminger

Patrick's fix for sky2 VLAN unregister, started me looking at other drivers. Many drivers had bogus kill_vid hooks, and the whole interface for kill_vid is only useful for devices that do receive filtering, so fix the interface and the drivers.

Looks good too me.

Acked-by
#3 lore raw

Re: [PATCH 4/5] atl1: eliminate unneeded kill_vid code

In reply to a message not in the archive
Quoted 55 lines · Stephen Hemminger

This driver has unneeded stubs for VLAN filtering.

---
 drivers/net/atl1/atl1_main.c   |   25 +------------------------
---
 drivers/net/atl1/atl1_main.c |   33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)
drivers/net/atl1/atl1_main.c +0 -30
@@ -1229,39 +1229,9 @@ static void atl1_vlan_rx_register(struct
 	spin_unlock_irqrestore(&adapter->lock, flags);
 }
 
-/* FIXME: justify or remove -- CHS */
-static void atl1_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-	/* We don't do Vlan filtering */
-	return;
-}
-
-/* FIXME: this looks wrong too -- CHS */
-static void atl1_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-	struct atl1_adapter *adapter = netdev_priv(netdev);
-	unsigned long flags;
-
-	spin_lock_irqsave(&adapter->lock, flags);
-	/* atl1_irq_disable(adapter); */
-	vlan_group_set_device(adapter->vlgrp, vid, NULL);
-	/* atl1_irq_enable(adapter); */
-	spin_unlock_irqrestore(&adapter->lock, flags);
-	/* We don't do Vlan filtering */
-	return;
-}
-
 static void atl1_restore_vlan(struct atl1_adapter *adapter)
 {
 	atl1_vlan_rx_register(adapter->netdev, adapter->vlgrp);
-	if (adapter->vlgrp) {
-		u16 vid;
-		for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
-			if (!vlan_group_get_device(adapter->vlgrp, vid))
-				continue;
-			atl1_vlan_rx_add_vid(adapter->netdev, vid);
-		}
-	}
 }
 
 static u16 tpd_avail(struct atl1_tpd_ring *tpd_ring)

drivers/net/atl1/atl1_main.c static int __devinit atl1_probe(struct p · line 2179

Quoted 9 lines
drivers/net/atl1/atl1_main.c +1 -2
@@ -2203,8 +2173,7 @@ static int __devinit atl1_probe(struct p
 	netdev->poll_controller = atl1_poll_controller;
 #endif
 	netdev->vlan_rx_register = atl1_vlan_rx_register;
-	netdev->vlan_rx_add_vid = atl1_vlan_rx_add_vid;
-	netdev->vlan_rx_kill_vid = atl1_vlan_rx_kill_vid;
+
 	netdev->ethtool_ops = &atl1_ethtool_ops;
 	adapter->bd_number = cards_found;
 	adapter->pci_using_64 = pci_using_64;

As the comments indicate, I was going to get around to doing this in my Copious Free Time anyway, so:

#5 lore raw

Re: [PATCH 1/5] VLAN: kill_vid is only useful for VLAN filtering devices

In reply to a message not in the archive
Quoted 10 lines · Stephen Hemminger

The interface for network device VLAN extension was confusing. The kill_vid function is only really useful for devices that do hardware filtering. Devices that only do VLAN receiption without filtering were being forced to provide the hook, and there were bugs in those devices.

Many drivers had kill_vid routine that called vlan_group_set_device, with NULL, but that is done already.

applied 1-5 to #upstream-fixes