| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Michael Chan <michael.chan@broadcom.com> |
| Date: Mon, 9 Jul 2018 02:24:49 -0400 |
| Subject: bnxt_en: Always set output parameters in bnxt_get_max_rings(). |
| |
| From: Michael Chan <michael.chan@broadcom.com> |
| |
| [ Upstream commit 78f058a4aa0f2280dc4d45d2c4a95728398ef857 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
| +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c |
| @@ -6862,11 +6862,11 @@ int bnxt_get_max_rings(struct bnxt *bp, |
| 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); |
| } |
| |