diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-25 12:04:22 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-25 12:04:22 +0400 |
| commit | 42ebd27bcbda7895fa07c61185a26d8379945ed0 (patch) | |
| tree | 51be64b0c2c0defd1a0ce3e6d55452dbd8a7aaae /drivers/net/ethernet/broadcom/tg3.c | |
| parent | a81fef347b32dea2b31275826afe1c93fa0d2d54 (diff) | |
| parent | 9f7ff8931e3c5ddc8535476971ec9501e9555c05 (diff) | |
| download | linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index b9f7022f4e81..e5d95c5ce1ad 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; |