From: Michael Chan <michael.chan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next v2 05/10] bnxt_en: Fix ethtool -l|-L inconsistent channel counts.
Date: Tue, 20 Sep 2016 02:50:23 -0400 [thread overview]
Message-ID: <1474354228-3221-6-git-send-email-michael.chan@broadcom.com> (raw)
In-Reply-To: <1474354228-3221-1-git-send-email-michael.chan@broadcom.com>
The existing code is inconsistent in reporting and accepting the combined
channel count. bnxt_get_channels() reports maximum combined as the
maximum rx count. bnxt_set_channels() accepts combined count that
cannot be bigger than max rx or max tx.
For example, if max rx = 2 and max tx = 1, we report max supported
combined to be 2. But if the user tries to set combined to 2, it will
fail because 2 is bigger than max tx which is 1.
Fix the code to be consistent. Max allowed combined = max(max_rx, max_tx).
We will accept a combined channel count <= max(max_rx, max_tx).
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index ae4458d..de893c9 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -348,7 +348,7 @@ static void bnxt_get_channels(struct net_device *dev,
int max_rx_rings, max_tx_rings, tcs;
bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, true);
- channel->max_combined = max_rx_rings;
+ channel->max_combined = max_t(int, max_rx_rings, max_tx_rings);
if (bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, false)) {
max_rx_rings = 0;
@@ -406,8 +406,8 @@ static int bnxt_set_channels(struct net_device *dev,
if (tcs > 1)
max_tx_rings /= tcs;
- if (sh && (channel->combined_count > max_rx_rings ||
- channel->combined_count > max_tx_rings))
+ if (sh &&
+ channel->combined_count > max_t(int, max_rx_rings, max_tx_rings))
return -ENOMEM;
if (!sh && (channel->rx_count > max_rx_rings ||
@@ -430,8 +430,10 @@ static int bnxt_set_channels(struct net_device *dev,
if (sh) {
bp->flags |= BNXT_FLAG_SHARED_RINGS;
- bp->rx_nr_rings = channel->combined_count;
- bp->tx_nr_rings_per_tc = channel->combined_count;
+ bp->rx_nr_rings = min_t(int, channel->combined_count,
+ max_rx_rings);
+ bp->tx_nr_rings_per_tc = min_t(int, channel->combined_count,
+ max_tx_rings);
} else {
bp->flags &= ~BNXT_FLAG_SHARED_RINGS;
bp->rx_nr_rings = channel->rx_count;
--
1.8.3.1
next prev parent reply other threads:[~2016-09-20 6:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 6:50 [PATCH net-next v2 00/10] bnxt: update for net-next Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 01/10] bnxt_en: Use RSS flags defined in the bnxt_hsi.h file Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 02/10] bnxt_en: Simplify PCI device names and add additinal PCI IDs Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 03/10] bnxt_en: Update to firmware interface spec 1.5.1 Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 04/10] bnxt_en: Added support for Secure Firmware Update Michael Chan
2016-09-20 6:50 ` Michael Chan [this message]
2016-09-20 14:52 ` [PATCH net-next v2 05/10] bnxt_en: Fix ethtool -l|-L inconsistent channel counts Jakub Kicinski
2016-09-20 6:50 ` [PATCH net-next v2 06/10] bnxt_en: Re-arrange bnxt_hwrm_func_qcaps() Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 07/10] bnxt_en: Call firmware to approve the random VF MAC address Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 08/10] bnxt_en: Pad TX packets below 52 bytes Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 09/10] bnxt_en: Support for "ethtool -r" command Michael Chan
2016-09-20 6:50 ` [PATCH net-next v2 10/10] bnxt_en: Fixed the VF link status after a link state change Michael Chan
2016-09-20 7:26 ` [PATCH net-next v2 00/10] bnxt: update for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474354228-3221-6-git-send-email-michael.chan@broadcom.com \
--to=michael.chan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).