Merge branch ‘bnxt_en-Misc-bug-fixes’ [Linux 5.1]

Merge branch ‘bnxt_en-Misc-bug-fixes’ [Linux 5.1]

This Linux kernel change "Merge branch ‘bnxt_en-Misc-bug-fixes’" is included in the Linux 5.1 release. This change is authored by David S. Miller <davem [at] davemloft.net> on Sat Apr 27 17:00:19 2019 -0400. The commit for this change in Linux stable tree is b2a20fd (patch). Other info about this change: Merge: fdfdf86 0b397b1

Merge branch 'bnxt_en-Misc-bug-fixes'

Michael Chan says:

====================
bnxt_en: Misc. bug fixes.

6 miscellaneous bug fixes covering several issues in error code paths,
a setup issue for statistics DMA, and an improvement for setting up
multicast address filters.

Please queue these for stable as well.
Patch #5 (bnxt_en: Fix statistics context reservation logic) is for the
most recent 5.0 stable only.  Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index b6cb7b8..52ade13 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1625,7 +1625,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
            netdev_warn(bp->dev, "RX buffer error %x\n", rx_err);
            bnxt_sched_reset(bp, rxr);
        }
-       goto next_rx;
+       goto next_rx_no_len;
    }

    len = le32_to_cpu(rxcmp->rx_cmp_len_flags_type) >> RX_CMP_LEN_SHIFT;
@@ -1706,12 +1706,13 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
    rc = 1;

 next_rx:
-   rxr->rx_prod = NEXT_RX(prod);
-   rxr->rx_next_cons = NEXT_RX(cons);
-
    cpr->rx_packets += 1;
    cpr->rx_bytes += len;

+next_rx_no_len:
+   rxr->rx_prod = NEXT_RX(prod);
+   rxr->rx_next_cons = NEXT_RX(cons);
+
 next_rx_no_prod_no_len:
    *raw_cons = tmp_raw_cons;

Leave a Reply

Your email address will not be published. Required fields are marked *