upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / drivers / net / ixgb / ixgb_main.c

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 98a3fc2..9c97c4a 100644 (file)
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -30,7 +30,7 @@
 
 char ixgb_driver_name[] = "ixgb";
 char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
-#define DRV_VERSION "1.0.66"
+#define DRV_VERSION "1.0.66-k2"
 char ixgb_driver_version[] = DRV_VERSION;
 char ixgb_copyright[] = "Copyright (c) 2001-2004 Intel Corporation.";
 
@@ -98,7 +98,6 @@ static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter,
 static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
 #endif
 static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter);
-static int ixgb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
 static void ixgb_tx_timeout(struct net_device *dev);
 static void ixgb_tx_timeout_task(struct net_device *dev);
 static void ixgb_vlan_rx_register(struct net_device *netdev,
@@ -125,7 +124,7 @@ struct notifier_block ixgb_notifier_reboot = {
 /* Exported from other modules */
 
 extern void ixgb_check_options(struct ixgb_adapter *adapter);
-extern int ixgb_ethtool_ioctl(struct net_device *netdev, struct ifreq *ifr);
+extern struct ethtool_ops ixgb_ethtool_ops;
 
 static struct pci_driver ixgb_driver = {
        .name = ixgb_driver_name,
@@ -374,9 +373,9 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->set_multicast_list = &ixgb_set_multi;
        netdev->set_mac_address = &ixgb_set_mac;
        netdev->change_mtu = &ixgb_change_mtu;
-       netdev->do_ioctl = &ixgb_ioctl;
        netdev->tx_timeout = &ixgb_tx_timeout;
        netdev->watchdog_timeo = HZ;
+       SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops);
 #ifdef CONFIG_IXGB_NAPI
        netdev->poll = &ixgb_clean;
        netdev->weight = 64;
@@ -1616,8 +1615,13 @@ static irqreturn_t ixgb_intr(int irq, void *data, struct pt_regs *regs)
                __netif_rx_schedule(netdev);
        }
 #else
-       for (i = 0; i < IXGB_MAX_INTR; i++)
-               if (!ixgb_clean_rx_irq(adapter) & !ixgb_clean_tx_irq(adapter))
+       /* yes, that is actually a & and it is meant to make sure that
+        * every pass through this for loop checks both receive and
+        * transmit queues for completed descriptors, intended to
+        * avoid starvation issues and assist tx/rx fairness. */
+       for(i = 0; i < IXGB_MAX_INTR; i++)
+               if(!ixgb_clean_rx_irq(adapter) &
+                  !ixgb_clean_tx_irq(adapter))
                        break;
        /* if RAIDC:EN == 1 and ICR:RXDMT0 == 1, we need to
         * set IMS:RXDMT0 to 1 to restart the RBD timer (POLL)
@@ -1679,7 +1683,7 @@ static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
        eop = tx_ring->buffer_info[i].next_to_watch;
        eop_desc = IXGB_TX_DESC(*tx_ring, eop);
 
-       while (eop_desc->status & cpu_to_le32(IXGB_TX_DESC_STATUS_DD)) {
+       while (eop_desc->status & IXGB_TX_DESC_STATUS_DD) {
 
                for (cleaned = FALSE; !cleaned;) {
                        tx_desc = IXGB_TX_DESC(*tx_ring, i);
@@ -1971,25 +1975,6 @@ static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
        rx_ring->next_to_use = i;
 }
 
-/**
- * ixgb_ioctl - perform a command - e.g: ethtool:get_driver_info.
- * @param netdev network interface device structure
- * @param ifr data to be used/filled in by the ioctl command
- * @param cmd ioctl command to execute
- **/
-
-static int ixgb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
-       switch (cmd) {
-       case SIOCETHTOOL:
-               return ixgb_ethtool_ioctl(netdev, ifr);
-       default:
-               return -EOPNOTSUPP;
-       }
-
-       return 0;
-}
-
 /**
  * ixgb_vlan_rx_register - enables or disables vlan tagging/stripping.
  * 
@@ -2119,7 +2104,7 @@ static int ixgb_suspend(struct pci_dev *pdev, uint32_t state)
        if (netif_running(netdev))
                ixgb_down(adapter, TRUE);
 
-       pci_save_state(pdev, adapter->pci_state);
+       pci_save_state(pdev);
 
        state = (state > 0) ? 3 : 0;
        pci_set_power_state(pdev, state);