Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25805dcf authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

network drivers: eliminate unneeded kill_vid code 



Many drivers had code that did kill_vid, but they weren't doing vlan
filtering. With new API the stub is unneeded unless device sets
NETIF_F_HW_VLAN_FILTER.

Bad habit: I couldn't resist fixing a couple of nearby style things
in acenic, and forcedeth.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent cb434e38

drivers/net/acenic.c

+3 −18
Original line number Diff line number Diff line
@@ -480,12 +480,10 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev, 
#if ACENIC_DO_VLAN

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	dev->vlan_rx_register = ace_vlan_rx_register;

	dev->vlan_rx_kill_vid = ace_vlan_rx_kill_vid;

#endif

	if (1) {



	dev->tx_timeout = &ace_watchdog;

	dev->watchdog_timeo = 5*HZ;

	}



	dev->open = &ace_open;

	dev->stop = &ace_close;
@@ -2283,19 +2281,6 @@ static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) 
	ace_unmask_irq(dev);

	local_irq_restore(flags);

}





static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct ace_private *ap = netdev_priv(dev);

	unsigned long flags;



	local_irq_save(flags);

	ace_mask_irq(dev);

	vlan_group_set_device(ap->vlgrp, vid, NULL);

	ace_unmask_irq(dev);

	local_irq_restore(flags);

}

#endif /* ACENIC_DO_VLAN */

drivers/net/acenic.h

+0 −1
Original line number Diff line number Diff line
@@ -787,7 +787,6 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev); 
static int read_eeprom_byte(struct net_device *dev, unsigned long offset);

#if ACENIC_DO_VLAN

static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp);

static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);

#endif



#endif /* _ACENIC_H_ */

drivers/net/amd8111e.c

+1 −10
Original line number Diff line number Diff line
@@ -1728,15 +1728,8 @@ static void amd8111e_vlan_rx_register(struct net_device *dev, struct vlan_group 
	lp->vlgrp = grp;

	spin_unlock_irq(&lp->lock);

}



static void amd8111e_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct amd8111e_priv *lp = netdev_priv(dev);

	spin_lock_irq(&lp->lock);

	vlan_group_set_device(lp->vlgrp, vid, NULL);

	spin_unlock_irq(&lp->lock);

}

#endif



static int amd8111e_enable_magicpkt(struct amd8111e_priv* lp)

{

	writel( VAL1|MPPLBA, lp->mmio + CMD3);
@@ -1996,7 +1989,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 
#if AMD8111E_VLAN_TAG_USED

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX ;

	dev->vlan_rx_register =amd8111e_vlan_rx_register;

	dev->vlan_rx_kill_vid = amd8111e_vlan_rx_kill_vid;

#endif



	lp = netdev_priv(dev);
@@ -2049,7 +2041,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 
#if AMD8111E_VLAN_TAG_USED

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	dev->vlan_rx_register =amd8111e_vlan_rx_register;

	dev->vlan_rx_kill_vid = amd8111e_vlan_rx_kill_vid;

#endif

	/* Probe the external PHY */

	amd8111e_probe_ext_phy(dev);

drivers/net/bnx2.c

+0 −14
Original line number Diff line number Diff line
@@ -4786,19 +4786,6 @@ bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp) 


	bnx2_netif_start(bp);

}



/* Called with rtnl_lock */

static void

bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)

{

	struct bnx2 *bp = netdev_priv(dev);



	bnx2_netif_stop(bp);

	vlan_group_set_device(bp->vlgrp, vid, NULL);

	bnx2_set_rx_mode(dev);



	bnx2_netif_start(bp);

}

#endif



/* Called with netif_tx_lock.
@@ -6453,7 +6440,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->watchdog_timeo = TX_TIMEOUT;

#ifdef BCM_VLAN

	dev->vlan_rx_register = bnx2_vlan_rx_register;

	dev->vlan_rx_kill_vid = bnx2_vlan_rx_kill_vid;

#endif

	dev->poll = bnx2_poll;

	dev->ethtool_ops = &bnx2_ethtool_ops;

drivers/net/chelsio/cxgb2.c

+0 −10
Original line number Diff line number Diff line
@@ -883,15 +883,6 @@ static void vlan_rx_register(struct net_device *dev, 
	t1_set_vlan_accel(adapter, grp != NULL);

	spin_unlock_irq(&adapter->async_lock);

}



static void vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)

{

	struct adapter *adapter = dev->priv;



	spin_lock_irq(&adapter->async_lock);

	vlan_group_set_device(adapter->vlan_grp, vid, NULL);

	spin_unlock_irq(&adapter->async_lock);

}

#endif



#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1099,7 +1090,6 @@ static int __devinit init_one(struct pci_dev *pdev, 
			netdev->features |=

				NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

			netdev->vlan_rx_register = vlan_rx_register;

			netdev->vlan_rx_kill_vid = vlan_rx_kill_vid;

#endif



			/* T204: disable TSO */