Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90e3f637 authored by Paul Burton's avatar Paul Burton Committed by David S. Miller
Browse files

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: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41fd60fa

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

+0 −13
Original line number Diff line number Diff line
@@ -349,25 +349,12 @@ static int pch_gbe_set_ringparam(struct net_device *netdev, 
		err = pch_gbe_setup_tx_resources(adapter, adapter->tx_ring);

		if (err)

			goto err_setup_tx;

		/* save the new, restore the old in order to free it,

		 * then restore the new back again */

#ifdef RINGFREE

		adapter->rx_ring = rx_old;

		adapter->tx_ring = tx_old;

		pch_gbe_free_rx_resources(adapter, adapter->rx_ring);

		pch_gbe_free_tx_resources(adapter, adapter->tx_ring);

		kfree(tx_old);

		kfree(rx_old);

		adapter->rx_ring = rxdr;

		adapter->tx_ring = txdr;

#else

		pch_gbe_free_rx_resources(adapter, rx_old);

		pch_gbe_free_tx_resources(adapter, tx_old);

		kfree(tx_old);

		kfree(rx_old);

		adapter->rx_ring = rxdr;

		adapter->tx_ring = txdr;

#endif

		err = pch_gbe_up(adapter);

	}

	return err;