Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / drivers / net / ixgbe / ixgbe_ethtool.c

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index ad9759de3cd868e1637e1ba33019b7eaed89a49c..67f87a79154dbff3f88ab64bddaa7ab2577b7099 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -712,30 +712,15 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
                return 0;
        }
 
-       if (adapter->num_tx_queues > adapter->num_rx_queues)
-               temp_ring = vmalloc(adapter->num_tx_queues *
-                                   sizeof(struct ixgbe_ring));
-       else
-               temp_ring = vmalloc(adapter->num_rx_queues *
-                                   sizeof(struct ixgbe_ring));
+       temp_ring = kcalloc(adapter->num_tx_queues,
+                           sizeof(struct ixgbe_ring), GFP_KERNEL);
        if (!temp_ring)
                return -ENOMEM;
 
        while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
                msleep(1);
 
-       if (netif_running(netdev))
-               ixgbe_down(adapter);
-
-       /*
-        * We can't just free everything and then setup again,
-        * because the ISRs in MSI-X mode get passed pointers
-        * to the tx and rx ring structs.
-        */
        if (new_tx_count != adapter->tx_ring->count) {
-               memcpy(temp_ring, adapter->tx_ring,
-                      adapter->num_tx_queues * sizeof(struct ixgbe_ring));
-
                for (i = 0; i < adapter->num_tx_queues; i++) {
                        temp_ring[i].count = new_tx_count;
                        err = ixgbe_setup_tx_resources(adapter, &temp_ring[i]);
@@ -747,21 +732,28 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
                                }
                                goto err_setup;
                        }
+                       temp_ring[i].v_idx = adapter->tx_ring[i].v_idx;
                }
-
-               for (i = 0; i < adapter->num_tx_queues; i++)
-                       ixgbe_free_tx_resources(adapter, &adapter->tx_ring[i]);
-
-               memcpy(adapter->tx_ring, temp_ring,
-                      adapter->num_tx_queues * sizeof(struct ixgbe_ring));
-
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_stop(netdev);
+               ixgbe_reset_interrupt_capability(adapter);
+               ixgbe_napi_del_all(adapter);
+               INIT_LIST_HEAD(&netdev->napi_list);
+               kfree(adapter->tx_ring);
+               adapter->tx_ring = temp_ring;
+               temp_ring = NULL;
                adapter->tx_ring_count = new_tx_count;
        }
 
-       if (new_rx_count != adapter->rx_ring->count) {
-               memcpy(temp_ring, adapter->rx_ring,
-                      adapter->num_rx_queues * sizeof(struct ixgbe_ring));
+       temp_ring = kcalloc(adapter->num_rx_queues,
+                           sizeof(struct ixgbe_ring), GFP_KERNEL);
+       if (!temp_ring) {
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_open(netdev);
+               return -ENOMEM;
+       }
 
+       if (new_rx_count != adapter->rx_ring->count) {
                for (i = 0; i < adapter->num_rx_queues; i++) {
                        temp_ring[i].count = new_rx_count;
                        err = ixgbe_setup_rx_resources(adapter, &temp_ring[i]);
@@ -773,13 +765,16 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
                                }
                                goto err_setup;
                        }
+                       temp_ring[i].v_idx = adapter->rx_ring[i].v_idx;
                }
-
-               for (i = 0; i < adapter->num_rx_queues; i++)
-                       ixgbe_free_rx_resources(adapter, &adapter->rx_ring[i]);
-
-               memcpy(adapter->rx_ring, temp_ring,
-                      adapter->num_rx_queues * sizeof(struct ixgbe_ring));
+               if (netif_running(netdev))
+                       netdev->netdev_ops->ndo_stop(netdev);
+               ixgbe_reset_interrupt_capability(adapter);
+               ixgbe_napi_del_all(adapter);
+               INIT_LIST_HEAD(&netdev->napi_list);
+               kfree(adapter->rx_ring);
+               adapter->rx_ring = temp_ring;
+               temp_ring = NULL;
 
                adapter->rx_ring_count = new_rx_count;
        }
@@ -787,8 +782,9 @@ static int ixgbe_set_ringparam(struct net_device *netdev,
        /* success! */
        err = 0;
 err_setup:
+       ixgbe_init_interrupt_scheme(adapter);
        if (netif_running(netdev))
-               ixgbe_up(adapter);
+               netdev->netdev_ops->ndo_open(netdev);
 
        clear_bit(__IXGBE_RESETTING, &adapter->state);
        return err;
@@ -881,8 +877,15 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
                        for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
                                sprintf(p, "tx_pb_%u_pxon", i);
+                               p += ETH_GSTRING_LEN;
+                               sprintf(p, "tx_pb_%u_pxoff", i);
+                               p += ETH_GSTRING_LEN;
                        }
                        for (i = 0; i < MAX_RX_PACKET_BUFFERS; i++) {
+                               sprintf(p, "rx_pb_%u_pxon", i);
+                               p += ETH_GSTRING_LEN;
+                               sprintf(p, "rx_pb_%u_pxoff", i);
+                               p += ETH_GSTRING_LEN;
                        }
                }
                /* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */