diff options
author | Michael Chan <michael.chan@broadcom.com> | 2017-07-11 13:05:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-11 10:32:11 -0700 |
commit | 3b6b34df342553a7522561e34288f5bb803aa9aa (patch) | |
tree | b4f5d946005dd413f7e2bc35fa4db83c922d98d1 /drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | |
parent | bnxt_en: Fix race conditions in .ndo_get_stats64(). (diff) | |
download | linux-dev-3b6b34df342553a7522561e34288f5bb803aa9aa.tar.xz linux-dev-3b6b34df342553a7522561e34288f5bb803aa9aa.zip |
bnxt_en: Fix bug in ethtool -L.
When changing channels from combined to rx/tx or vice versa, the code
uses the wrong "sh" parameter to determine if we are reserving rings
for shared or non-shared mode. It should be using the ethtool requested
"sh" parameter instead of the current "sh" parameter.
Fix it by passing the "sh" parameter to bnxt_reserve_rings(). For
ethtool, we will pass in the requested "sh" parameter.
Fixes: 391be5c27364 ("bnxt_en: Implement new scheme to reserve tx rings.")
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c index 7d67552e70d7..3961a6807454 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c @@ -170,7 +170,7 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) if (!tc) tc = 1; rc = bnxt_reserve_rings(bp, bp->tx_nr_rings_per_tc, bp->rx_nr_rings, - tc, tx_xdp); + true, tc, tx_xdp); if (rc) { netdev_warn(dev, "Unable to reserve enough TX rings to support XDP.\n"); return rc; |