Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a055450a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: 2 bug fixes.

Bug fixes in bnxt_setup_tc() and VF vitual link state.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7b5b74ef 73b9bad6

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+6 −5
Original line number Diff line number Diff line
@@ -6309,6 +6309,7 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
			 struct tc_to_netdev *ntc)

{

	struct bnxt *bp = netdev_priv(dev);

	bool sh = false;

	u8 tc;



	if (ntc->type != TC_SETUP_MQPRIO)
@@ -6325,13 +6326,12 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
	if (netdev_get_num_tc(dev) == tc)

		return 0;



	if (tc) {

		int max_rx_rings, max_tx_rings, rc;

		bool sh = false;



	if (bp->flags & BNXT_FLAG_SHARED_RINGS)

		sh = true;



	if (tc) {

		int max_rx_rings, max_tx_rings, rc;



		rc = bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, sh);

		if (rc || bp->tx_nr_rings_per_tc * tc > max_tx_rings)

			return -ENOMEM;
@@ -6348,7 +6348,8 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
		bp->tx_nr_rings = bp->tx_nr_rings_per_tc;

		netdev_reset_tc(dev);

	}

	bp->cp_nr_rings = max_t(int, bp->tx_nr_rings, bp->rx_nr_rings);

	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;



	if (netif_running(bp->dev))

drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c

+2 −2
Original line number Diff line number Diff line
@@ -774,8 +774,8 @@ static int bnxt_vf_set_link(struct bnxt *bp, struct bnxt_vf_info *vf) 


		if (vf->flags & BNXT_VF_LINK_UP) {

			/* if physical link is down, force link up on VF */

			if (phy_qcfg_resp.link ==

			    PORT_PHY_QCFG_RESP_LINK_NO_LINK) {

			if (phy_qcfg_resp.link !=

			    PORT_PHY_QCFG_RESP_LINK_LINK) {

				phy_qcfg_resp.link =

					PORT_PHY_QCFG_RESP_LINK_LINK;

				phy_qcfg_resp.link_speed = cpu_to_le16(