Commit 8b0c1167 authored by Rick Jones's avatar Rick Jones Committed by David S. Miller
Browse files

net: Remove unnecessary driver assignments of ethtool_ringparam fields to zero 



Per comments from Ben Hutchings on a previous patch, sweep the floors
a little removing unnecessary assignments of zero to fields of struct
ethtool_ringparam in driver code supporting ethtool -g.

Signed-off-by: default avatarRick Jones <rick.jones2@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d0861ac

drivers/net/ethernet/3com/typhoon.c

+0 −4
Original line number Diff line number Diff line
@@ -1148,13 +1148,9 @@ static void 
typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)

{

	ering->rx_max_pending = RXENT_ENTRIES;

	ering->rx_mini_max_pending = 0;

	ering->rx_jumbo_max_pending = 0;

	ering->tx_max_pending = TXLO_ENTRIES - 1;



	ering->rx_pending = RXENT_ENTRIES;

	ering->rx_mini_pending = 0;

	ering->rx_jumbo_pending = 0;

	ering->tx_pending = TXLO_ENTRIES - 1;

}

drivers/net/ethernet/atheros/atlx/atl1.c

+0 −4
Original line number Diff line number Diff line
@@ -3473,12 +3473,8 @@ static void atl1_get_ringparam(struct net_device *netdev, 


	ring->rx_max_pending = ATL1_MAX_RFD;

	ring->tx_max_pending = ATL1_MAX_TPD;

	ring->rx_mini_max_pending = 0;

	ring->rx_jumbo_max_pending = 0;

	ring->rx_pending = rxdr->count;

	ring->tx_pending = txdr->count;

	ring->rx_mini_pending = 0;

	ring->rx_jumbo_pending = 0;

}



static int atl1_set_ringparam(struct net_device *netdev,

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+0 −2
Original line number Diff line number Diff line
@@ -1398,8 +1398,6 @@ static void bcm_enet_get_ringparam(struct net_device *dev, 
	/* rx/tx ring is actually only limited by memory */

	ering->rx_max_pending = 8192;

	ering->tx_max_pending = 8192;

	ering->rx_mini_max_pending = 0;

	ering->rx_jumbo_max_pending = 0;

	ering->rx_pending = priv->rx_ring_size;

	ering->tx_pending = priv->tx_ring_size;

}

drivers/net/ethernet/broadcom/bnx2.c

+0 −2
Original line number Diff line number Diff line
@@ -7155,11 +7155,9 @@ bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering) 
	struct bnx2 *bp = netdev_priv(dev);



	ering->rx_max_pending = MAX_TOTAL_RX_DESC_CNT;

	ering->rx_mini_max_pending = 0;

	ering->rx_jumbo_max_pending = MAX_TOTAL_RX_PG_DESC_CNT;



	ering->rx_pending = bp->rx_ring_size;

	ering->rx_mini_pending = 0;

	ering->rx_jumbo_pending = bp->rx_pg_ring_size;



	ering->tx_max_pending = MAX_TX_DESC_CNT;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+0 −5
Original line number Diff line number Diff line
@@ -1344,17 +1344,12 @@ static void bnx2x_get_ringparam(struct net_device *dev, 
	struct bnx2x *bp = netdev_priv(dev);



	ering->rx_max_pending = MAX_RX_AVAIL;

	ering->rx_mini_max_pending = 0;

	ering->rx_jumbo_max_pending = 0;



	if (bp->rx_ring_size)

		ering->rx_pending = bp->rx_ring_size;

	else

		ering->rx_pending = MAX_RX_AVAIL;



	ering->rx_mini_pending = 0;

	ering->rx_jumbo_pending = 0;



	ering->tx_max_pending = MAX_TX_AVAIL;

	ering->tx_pending = bp->tx_ring_size;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE