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

Commit 09e83b5d authored by David S. Miller's avatar David S. Miller
Browse files

netdev: Kill NETIF_F_MULTI_QUEUE. 



There is no need for a feature bit for something that
can be tested by simply checking the TX queue count.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8a0464c

Documentation/networking/multiqueue.txt

+0 −11
Original line number Diff line number Diff line
@@ -24,15 +24,4 @@ netif_{start|stop|wake}_subqueue() functions to manage each queue while the 
device is still operational.  netdev->queue_lock is still used when the device

comes online or when it's completely shut down (unregister_netdev(), etc.).



Finally, the base driver should indicate that it is a multiqueue device.  The

feature flag NETIF_F_MULTI_QUEUE should be added to the netdev->features

bitmap on device initialization.  Below is an example from e1000:



#ifdef CONFIG_E1000_MQ

	if ( (adapter->hw.mac.type == e1000_82571) ||

	     (adapter->hw.mac.type == e1000_82572) ||

	     (adapter->hw.mac.type == e1000_80003es2lan))

		netdev->features |= NETIF_F_MULTI_QUEUE;

#endif



Author: Peter P. Waskiewicz Jr. <peter.p.waskiewicz.jr@intel.com>

drivers/net/cpmac.c

+0 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev) 
	dev->set_multicast_list = cpmac_set_multicast_list;

	dev->tx_timeout         = cpmac_tx_timeout;

	dev->ethtool_ops        = &cpmac_ethtool_ops;

	dev->features |= NETIF_F_MULTI_QUEUE;



	netif_napi_add(dev, &priv->napi, cpmac_poll, 64);

drivers/net/igb/igb_main.c

+0 −2
Original line number Diff line number Diff line
@@ -1155,8 +1155,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
	if (pci_using_dac)

		netdev->features |= NETIF_F_HIGHDMA;



	netdev->features |= NETIF_F_MULTI_QUEUE;



	netdev->features |= NETIF_F_LLTX;

	adapter->en_mng_pt = igb_enable_mng_pass_thru(&adapter->hw);

drivers/net/ixgbe/ixgbe_main.c

+0 −2
Original line number Diff line number Diff line
@@ -3566,8 +3566,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	if (pci_using_dac)

		netdev->features |= NETIF_F_HIGHDMA;



	netdev->features |= NETIF_F_MULTI_QUEUE;



	/* make sure the EEPROM is good */

	if (ixgbe_validate_eeprom_checksum(hw, NULL) < 0) {

		dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n");

drivers/net/s2io.c

+0 −2
Original line number Diff line number Diff line
@@ -7966,8 +7966,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
		dev->features |= NETIF_F_UFO;

		dev->features |= NETIF_F_HW_CSUM;

	}

	if (config->multiq)

		dev->features |= NETIF_F_MULTI_QUEUE;

	dev->tx_timeout = &s2io_tx_watchdog;

	dev->watchdog_timeo = WATCH_DOG_TIMEOUT;

	INIT_WORK(&sp->rst_timer_task, s2io_restart_nic);