[PATCH net] tg3: update rx_jumbo_pending ring param only when jumbo frames are enabled

[PATCH net] tg3: update rx_jumbo_pending ring param only when jumbo frames are enabled

[Ivan Vecera]

The patch fixes a problem with dropped jumbo frames after usage of
'ethtool -G ... rx'.

Scenario:
1. ip link set eth0 up
2. ethtool -G eth0 rx N # <- This zeroes rx-jumbo
3. ip link set mtu 9000 dev eth0

The ethtool command set rx_jumbo_pending to zero so any received jumbo
packets are dropped and you need to use 'ethtool -G eth0 rx-jumbo N'
to workaround the issue.
The patch changes the logic so rx_jumbo_pending value is changed only if
jumbo frames are enabled (MTU > 1500).

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
 drivers/net/ethernet/broadcom/tg3.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index b9f7022..e5d95c5 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -12286,7 +12286,9 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
 	if (tg3_flag(tp, MAX_RXPEND_64) &&
 	    tp->rx_pending > 63)
 		tp->rx_pending = 63;
-	tp->rx_jumbo_pending = ering->rx_jumbo_pending;
+
+	if (tg3_flag(tp, JUMBO_RING_ENABLE))
+		tp->rx_jumbo_pending = ering->rx_jumbo_pending;
 
 	for (i = 0; i < tp->irq_max; i++)
 		tp->napi[i].tx_pending = ering->tx_pending;
-- 
1.8.3.2

Re: [PATCH net] tg3: update rx_jumbo_pending ring param only when jumbo frames are enabled

[Michael Chan]

On Thu, 2014-04-17 at 14:51 +0200, Ivan Vecera wrote: 
> The patch fixes a problem with dropped jumbo frames after usage of
> 'ethtool -G ... rx'.
> 
> Scenario:
> 1. ip link set eth0 up
> 2. ethtool -G eth0 rx N # <- This zeroes rx-jumbo
> 3. ip link set mtu 9000 dev eth0
> 
> The ethtool command set rx_jumbo_pending to zero so any received jumbo
> packets are dropped and you need to use 'ethtool -G eth0 rx-jumbo N'
> to workaround the issue.
> The patch changes the logic so rx_jumbo_pending value is changed only if
> jumbo frames are enabled (MTU > 1500).
> 
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>

Acked-by: Michael Chan <mchan@broadcom.com>

Re: [PATCH net] tg3: update rx_jumbo_pending ring param only when jumbo frames are enabled

[David Miller]

From: Ivan Vecera <ivecera@redhat.com>
Date: Thu, 17 Apr 2014 14:51:08 +0200

> The patch fixes a problem with dropped jumbo frames after usage of
> 'ethtool -G ... rx'.
> 
> Scenario:
> 1. ip link set eth0 up
> 2. ethtool -G eth0 rx N # <- This zeroes rx-jumbo
> 3. ip link set mtu 9000 dev eth0
> 
> The ethtool command set rx_jumbo_pending to zero so any received jumbo
> packets are dropped and you need to use 'ethtool -G eth0 rx-jumbo N'
> to workaround the issue.
> The patch changes the logic so rx_jumbo_pending value is changed only if
> jumbo frames are enabled (MTU > 1500).
> 
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>

Applied and queued up for -stable.