ibmvnic: Reorganize device close

Introduce a function to halt network operations and clean up any
unused or outstanding socket buffers. Then, during device close,
disable backing adapter before halting all queues and performing
cleanup. This ensures all backing device operations will be
stopped before the driver cleans up shared resources.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index fca0533d517f4c993747c53822de648bfa76d8fa..d93f28658a2c3b7ebd7c64af3668c83cbd790164 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1143,14 +1143,11 @@ static void clean_tx_pools(struct ibmvnic_adapter *adapter)
        }
 }
 
        }
 }
 

-static int __ibmvnic_close(struct net_device *netdev)
+static void ibmvnic_cleanup(struct net_device *netdev)

 {
        struct ibmvnic_adapter *adapter = netdev_priv(netdev);
 {
        struct ibmvnic_adapter *adapter = netdev_priv(netdev);

-       int rc = 0;

        int i;
 
        int i;
 

-       adapter->state = VNIC_CLOSING;
-

        /* ensure that transmissions are stopped if called by do_reset */
        if (adapter->resetting)
                netif_tx_disable(netdev);
        /* ensure that transmissions are stopped if called by do_reset */
        if (adapter->resetting)
                netif_tx_disable(netdev);


@@ -1168,10 +1165,6 @@ static int __ibmvnic_close(struct net_device *netdev)
                        }
        }
 
                        }
        }
 

-       rc = set_link_state(adapter, IBMVNIC_LOGICAL_LNK_DN);
-       if (rc)
-               return rc;
-

        if (adapter->rx_scrq) {
                for (i = 0; i < adapter->req_rx_queues; i++) {
                        if (adapter->rx_scrq[i]->irq) {
        if (adapter->rx_scrq) {
                for (i = 0; i < adapter->req_rx_queues; i++) {
                        if (adapter->rx_scrq[i]->irq) {


@@ -1183,8 +1176,20 @@ static int __ibmvnic_close(struct net_device *netdev)
        }
        clean_rx_pools(adapter);
        clean_tx_pools(adapter);
        }
        clean_rx_pools(adapter);
        clean_tx_pools(adapter);

+}
+
+static int __ibmvnic_close(struct net_device *netdev)
+{
+       struct ibmvnic_adapter *adapter = netdev_priv(netdev);
+       int rc = 0;
+
+       adapter->state = VNIC_CLOSING;
+       rc = set_link_state(adapter, IBMVNIC_LOGICAL_LNK_DN);
+       if (rc)
+               return rc;
+       ibmvnic_cleanup(netdev);

        adapter->state = VNIC_CLOSED;
        adapter->state = VNIC_CLOSED;

-       return rc;
+       return 0;

 }
 
 static int ibmvnic_close(struct net_device *netdev)
 }
 
 static int ibmvnic_close(struct net_device *netdev)