staging: et131x: Remove redundant et131x_reset_recv() call
authorMark Einon <mark.einon@gmail.com>
Sun, 23 Oct 2011 09:22:44 +0000 (10:22 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 23 Oct 2011 09:35:11 +0000 (11:35 +0200)
This call doesn't do anything useful - only warns on the receive list
being empty, so removed it.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/et131x/et131x.c

index 8c557cfa0c1a50a5467f6823e8b9c1b9ec066b6e..f521e3319aab7bb1519dbfe84a55b724b8fd8f5c 100644 (file)
@@ -605,7 +605,6 @@ int32_t et131x_mii_write(struct et131x_adapter *adapter,
 void et131x_rx_dma_memory_free(struct et131x_adapter *adapter);
 void et131x_rx_dma_disable(struct et131x_adapter *adapter);
 void et131x_rx_dma_enable(struct et131x_adapter *adapter);
-void et131x_reset_recv(struct et131x_adapter *adapter);
 void et131x_init_send(struct et131x_adapter *adapter);
 void et131x_tx_dma_enable(struct et131x_adapter *adapter);
 
@@ -1839,9 +1838,6 @@ void et1310_disable_phy_coma(struct et131x_adapter *adapter)
        /* Re-initialize the send structures */
        et131x_init_send(adapter);
 
-       /* Reset the RFD list and re-start RU  */
-       et131x_reset_recv(adapter);
-
        /* Bring the device back to the state it was during init prior to
         * autonegotiation being complete.  This way, when we get the auto-neg
         * complete interrupt, we can complete init by calling ConfigMacREGS2.
@@ -2881,17 +2877,6 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
        return rfd;
 }
 
-/**
- * et131x_reset_recv - Reset the receive list
- * @adapter: pointer to our adapter
- *
- * Assumption, Rcv spinlock has been acquired.
- */
-void et131x_reset_recv(struct et131x_adapter *adapter)
-{
-       WARN_ON(list_empty(&adapter->rx_ring.recv_list));
-}
-
 /**
  * et131x_handle_recv_interrupt - Interrupt handler for receive processing
  * @adapter: pointer to our adapter
@@ -4251,9 +4236,6 @@ static void et131x_adjust_link(struct net_device *netdev)
                        /* Re-initialize the send structures */
                        et131x_init_send(adapter);
 
-                       /* Reset the RFD list and re-start RU */
-                       et131x_reset_recv(adapter);
-
                        /*
                         * Bring the device back to the state it was during
                         * init prior to autonegotiation being complete. This