diff options
| author | Michael Chan | 2018-07-09 08:24:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-07-10 01:27:14 +0200 |
| commit | 78f058a4aa0f2280dc4d45d2c4a95728398ef857 (patch) | |
| tree | fed185ef2a7033527110fc19708dd8781ccc0ed6 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | bnxt_en: Fix inconsistent BNXT_FLAG_AGG_RINGS logic. (diff) | |
| download | kernel-qcow2-linux-78f058a4aa0f2280dc4d45d2c4a95728398ef857.tar.gz kernel-qcow2-linux-78f058a4aa0f2280dc4d45d2c4a95728398ef857.tar.xz kernel-qcow2-linux-78f058a4aa0f2280dc4d45d2c4a95728398ef857.zip | |
bnxt_en: Always set output parameters in bnxt_get_max_rings().
The current code returns -ENOMEM and does not bother to set the output
parameters to 0 when no rings are available. Some callers, such as
bnxt_get_channels() will display garbage ring numbers when that happens.
Fix it by always setting the output parameters.
Fixes: 6e6c5a57fbe1 ("bnxt_en: Modify bnxt_get_max_rings() to support shared or non shared 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.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 5d95d788737f..5a47607aba53 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -8502,11 +8502,11 @@ int bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, bool shared) int rx, tx, cp; _bnxt_get_max_rings(bp, &rx, &tx, &cp); + *max_rx = rx; + *max_tx = tx; if (!rx || !tx || !cp) return -ENOMEM; - *max_rx = rx; - *max_tx = tx; return bnxt_trim_rings(bp, max_rx, max_tx, cp, shared); } |