aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-17 04:52:12 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-17 22:21:03 -0400
commit09e83b5d7d1878065e2453239b49b684cd0fe4e5 (patch)
treea08d06c81d7bcd47e432443e24b126101ea1f2b9 /drivers/net
parente8a0464cc950972824e2e128028ae3db666ec1ed (diff)
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/cpmac.c1
-rw-r--r--drivers/net/igb/igb_main.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c2
-rw-r--r--drivers/net/s2io.c2
4 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index d630e2a72f42..7c7b54e4828e 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1165,7 +1165,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
1165 dev->set_multicast_list = cpmac_set_multicast_list; 1165 dev->set_multicast_list = cpmac_set_multicast_list;
1166 dev->tx_timeout = cpmac_tx_timeout; 1166 dev->tx_timeout = cpmac_tx_timeout;
1167 dev->ethtool_ops = &cpmac_ethtool_ops; 1167 dev->ethtool_ops = &cpmac_ethtool_ops;
1168 dev->features |= NETIF_F_MULTI_QUEUE;
1169 1168
1170 netif_napi_add(dev, &priv->napi, cpmac_poll, 64); 1169 netif_napi_add(dev, &priv->napi, cpmac_poll, 64);
1171 1170
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 64a150a16f39..471c194cd54e 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1155,8 +1155,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1155 if (pci_using_dac) 1155 if (pci_using_dac)
1156 netdev->features |= NETIF_F_HIGHDMA; 1156 netdev->features |= NETIF_F_HIGHDMA;
1157 1157
1158 netdev->features |= NETIF_F_MULTI_QUEUE;
1159
1160 netdev->features |= NETIF_F_LLTX; 1158 netdev->features |= NETIF_F_LLTX;
1161 adapter->en_mng_pt = igb_enable_mng_pass_thru(&adapter->hw); 1159 adapter->en_mng_pt = igb_enable_mng_pass_thru(&adapter->hw);
1162 1160
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7d8bf94d3783..e6df9233f5ef 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3566,8 +3566,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
3566 if (pci_using_dac) 3566 if (pci_using_dac)
3567 netdev->features |= NETIF_F_HIGHDMA; 3567 netdev->features |= NETIF_F_HIGHDMA;
3568 3568
3569 netdev->features |= NETIF_F_MULTI_QUEUE;
3570
3571 /* make sure the EEPROM is good */ 3569 /* make sure the EEPROM is good */
3572 if (ixgbe_validate_eeprom_checksum(hw, NULL) < 0) { 3570 if (ixgbe_validate_eeprom_checksum(hw, NULL) < 0) {
3573 dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n"); 3571 dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n");
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 517425dcb77c..5f0fcb04afff 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7966,8 +7966,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
7966 dev->features |= NETIF_F_UFO; 7966 dev->features |= NETIF_F_UFO;
7967 dev->features |= NETIF_F_HW_CSUM; 7967 dev->features |= NETIF_F_HW_CSUM;
7968 } 7968 }
7969 if (config->multiq)
7970 dev->features |= NETIF_F_MULTI_QUEUE;
7971 dev->tx_timeout = &s2io_tx_watchdog; 7969 dev->tx_timeout = &s2io_tx_watchdog;
7972 dev->watchdog_timeo = WATCH_DOG_TIMEOUT; 7970 dev->watchdog_timeo = WATCH_DOG_TIMEOUT;
7973 INIT_WORK(&sp->rst_timer_task, s2io_restart_nic); 7971 INIT_WORK(&sp->rst_timer_task, s2io_restart_nic);