From 0bd33c0807d9a5c498d7e266c556ffeea98a8331 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Sun, 23 Oct 2011 10:22:44 +0100 Subject: [PATCH] --- yaml --- r: 268883 b: refs/heads/master c: 5ad5be581ed19becd184731fd0e9711abc5650c6 h: refs/heads/master i: 268881: eb71526db42a3008a94627ac4abac054d0e21960 268879: d7cdf5f55f31ad48e4b3fd57791798f13403f71b v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index d3d404ca881a..1600b80377f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16d8de3cc9484ccebab20331c03d1b6ba8636d76 +refs/heads/master: 5ad5be581ed19becd184731fd0e9711abc5650c6 diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c index 8c557cfa0c1a..f521e3319aab 100644 --- a/trunk/drivers/staging/et131x/et131x.c +++ b/trunk/drivers/staging/et131x/et131x.c @@ -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