Skip to content

Commit 90e3f63

Browse files
paulburtondavem330
authored andcommitted
net: pch_gbe: Remove dead RINGFREE code
The pch_gbe driver includes some code which appears to be an attempt to work around a problem with the pch_gbe_free_rx_resources & pch_gbe_free_tx_resources functions that no longer exists. Remove the code guarded by the never-defined RINGFREE preprocessor macro. Signed-off-by: Paul Burton <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 41fd60f commit 90e3f63

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -349,25 +349,12 @@ static int pch_gbe_set_ringparam(struct net_device *netdev,
349349
err = pch_gbe_setup_tx_resources(adapter, adapter->tx_ring);
350350
if (err)
351351
goto err_setup_tx;
352-
/* save the new, restore the old in order to free it,
353-
* then restore the new back again */
354-
#ifdef RINGFREE
355-
adapter->rx_ring = rx_old;
356-
adapter->tx_ring = tx_old;
357-
pch_gbe_free_rx_resources(adapter, adapter->rx_ring);
358-
pch_gbe_free_tx_resources(adapter, adapter->tx_ring);
359-
kfree(tx_old);
360-
kfree(rx_old);
361-
adapter->rx_ring = rxdr;
362-
adapter->tx_ring = txdr;
363-
#else
364352
pch_gbe_free_rx_resources(adapter, rx_old);
365353
pch_gbe_free_tx_resources(adapter, tx_old);
366354
kfree(tx_old);
367355
kfree(rx_old);
368356
adapter->rx_ring = rxdr;
369357
adapter->tx_ring = txdr;
370-
#endif
371358
err = pch_gbe_up(adapter);
372359
}
373360
return err;

0 commit comments

Comments
 (0)