From: Michael Chan Date: Wed, 23 Aug 2017 23:34:03 +0000 (-0400) Subject: bnxt_en: Fix .ndo_setup_tc() to include XDP rings. X-Git-Tag: v4.1.12-124.31.3~963 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=705a54497175a392e1bf12f6d9fd6b437e8edd2e;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Fix .ndo_setup_tc() to include XDP rings. Orabug: 27648355, 27648339 When the number of TX rings is changed in bnxt_setup_tc(), we need to include the XDP rings in the total TX ring count. Fixes: 38413406277f ("bnxt_en: Add support for XDP_TX action.") Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 87e9b3778c94694c9e098c91a0cc05725f0e017f) Signed-off-by: Brian Maly Reviewed-by: Jack Vogel --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index ae10de0f5106..ee96c0750c42 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7200,6 +7200,7 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc) bp->tx_nr_rings = bp->tx_nr_rings_per_tc; netdev_reset_tc(dev); } + bp->tx_nr_rings += bp->tx_nr_rings_xdp; bp->cp_nr_rings = sh ? max_t(int, bp->tx_nr_rings, bp->rx_nr_rings) : bp->tx_nr_rings + bp->rx_nr_rings; bp->num_stat_ctxs = bp->cp_nr_rings;