Commit ee9a43b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bluetooth.

  Current release - regressions:

   - eth: bnxt_en: fix memory out-of-bounds in bnxt_fill_hw_rss_tbl() on
     older chips

  Current release - new code bugs:

   - ethtool: fix off-by-one error / kdoc contradicting the code for max
     RSS context IDs

   - Bluetooth: hci_qca:
      - QCA6390: fix support on non-DT platforms
      - QCA6390: don't call pwrseq_power_off() twice
      - fix a NULL-pointer derefence at shutdown

   - eth: ice: fix incorrect assigns of FEC counters

  Previous releases - regressions:

   - mptcp: fix handling endpoints with both 'signal' and 'subflow'
     flags set

   - virtio-net: fix changing ring count when vq IRQ coalescing not
     supported

   - eth: gve: fix use of netif_carrier_ok() during reconfig / reset

  Previous releases - always broken:

   - eth: idpf: fix bugs in queue re-allocation on reconfig / reset

   - ethtool: fix context creation with no parameters

  Misc:

   - linkwatch: use system_unbound_wq to ease RTNL contention"

* tag 'net-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (41 commits)
  net: dsa: microchip: disable EEE for KSZ8567/KSZ9567/KSZ9896/KSZ9897.
  ethtool: Fix context creation with no parameters
  net: ethtool: fix off-by-one error in max RSS context IDs
  net: pse-pd: tps23881: include missing bitfield.h header
  net: fec: Stop PPS on driver remove
  net: bcmgenet: Properly overlay PHY and MAC Wake-on-LAN capabilities
  l2tp: fix lockdep splat
  net: stmmac: dwmac4: fix PCS duplex mode decode
  idpf: fix UAFs when destroying the queues
  idpf: fix memleak in vport interrupt configuration
  idpf: fix memory leaks and crashes while performing a soft reset
  bnxt_en : Fix memory out-of-bounds in bnxt_fill_hw_rss_tbl()
  net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register()
  net/smc: add the max value of fallback reason count
  Bluetooth: hci_sync: avoid dup filtering when passive scanning with adv monitor
  Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
  Bluetooth: hci_qca: fix a NULL-pointer derefence at shutdown
  Bluetooth: hci_qca: fix QCA6390 support on non-DT platforms
  Bluetooth: hci_qca: don't call pwrseq_power_off() twice for QCA6390
  ice: Fix incorrect assigns of FEC counts
  ...
parents 9466b6ae 2ff4ceb0

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13541,7 +13541,7 @@ MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) 
M:	Mirko Lindner <mlindner@marvell.com>

M:	Stephen Hemminger <stephen@networkplumber.org>

L:	netdev@vger.kernel.org

S:	Maintained

S:	Odd fixes

F:	drivers/net/ethernet/marvell/sk*









MARVELL LIBERTAS WIRELESS DRIVER
































drivers/bluetooth/hci_qca.c



+9
−10






























Original line number
Diff line number
Diff line







@@ -2160,7 +2160,7 @@ static void qca_power_shutdown(struct hci_uart *hu)







	qcadev = serdev_device_get_drvdata(hu->serdev);









	power = qcadev->bt_power;



















	if (power->pwrseq) {









	if (power && power->pwrseq) {









		pwrseq_power_off(power->pwrseq);









		set_bit(QCA_BT_OFF, &qca->flags);









		return;








@@ -2187,10 +2187,6 @@ static void qca_power_shutdown(struct hci_uart *hu)







		}









		break;



















	case QCA_QCA6390:









		pwrseq_power_off(qcadev->bt_power->pwrseq);









		break;



















	default:









		gpiod_set_value_cansleep(qcadev->bt_en, 0);









	}








@@ -2416,11 +2412,14 @@ static int qca_serdev_probe(struct serdev_device *serdev)







		break;



















	case QCA_QCA6390:









		if (dev_of_node(&serdev->dev)) {









			qcadev->bt_power->pwrseq = devm_pwrseq_get(&serdev->dev,









								   "bluetooth");









			if (IS_ERR(qcadev->bt_power->pwrseq))









				return PTR_ERR(qcadev->bt_power->pwrseq);









			break;









		}









		fallthrough;



















	default:









		qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",
































drivers/net/dsa/bcm_sf2.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -675,8 +675,10 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)







			of_remove_property(child, prop);



















		phydev = of_phy_find_device(child);









		if (phydev)









		if (phydev) {









			phy_device_remove(phydev);









			phy_device_free(phydev);









		}









	}



















	err = mdiobus_register(priv->user_mii_bus);
































drivers/net/dsa/microchip/ksz_common.c



+16
−0






























Original line number
Diff line number
Diff line







@@ -2578,7 +2578,11 @@ static u32 ksz_get_phy_flags(struct dsa_switch *ds, int port)







		if (!port)









			return MICREL_KSZ8_P1_ERRATA;









		break;









	case KSZ8567_CHIP_ID:









	case KSZ9477_CHIP_ID:









	case KSZ9567_CHIP_ID:









	case KSZ9896_CHIP_ID:









	case KSZ9897_CHIP_ID:









		/* KSZ9477 Errata DS80000754C









		 *









		 * Module 4: Energy Efficient Ethernet (EEE) feature select must








@@ -2588,6 +2592,13 @@ static u32 ksz_get_phy_flags(struct dsa_switch *ds, int port)







		 *   controls. If not disabled, the PHY ports can auto-negotiate









		 *   to enable EEE, and this feature can cause link drops when









		 *   linked to another device supporting EEE.









		 *









		 * The same item appears in the errata for the KSZ9567, KSZ9896,









		 * and KSZ9897.









		 *









		 * A similar item appears in the errata for the KSZ8567, but









		 * provides an alternative workaround. For now, use the simple









		 * workaround of disabling the EEE feature for this device too.









		 */









		return MICREL_NO_EEE;









	}








@@ -3764,6 +3775,11 @@ static int ksz_port_set_mac_address(struct dsa_switch *ds, int port,







		return -EBUSY;









	}



















	/* Need to initialize variable as the code to fill in settings may









	 * not be executed.









	 */









	wol.wolopts = 0;



















	ksz_get_wol(ds, dp->index, &wol);









	if (wol.wolopts & WAKE_MAGIC) {









		dev_err(ds->dev,
































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



+7
−6






























Original line number
Diff line number
Diff line







@@ -7591,19 +7591,20 @@ static bool bnxt_need_reserve_rings(struct bnxt *bp)







	int rx = bp->rx_nr_rings, stat;









	int vnic, grp = rx;



















	if (hw_resc->resv_tx_rings != bp->tx_nr_rings &&









	    bp->hwrm_spec_code >= 0x10601)









		return true;



















	/* Old firmware does not need RX ring reservations but we still









	 * need to setup a default RSS map when needed.  With new firmware









	 * we go through RX ring reservations first and then set up the









	 * RSS map for the successfully reserved RX rings when needed.









	 */









	if (!BNXT_NEW_RM(bp)) {









	if (!BNXT_NEW_RM(bp))









		bnxt_check_rss_tbl_no_rmgr(bp);



















	if (hw_resc->resv_tx_rings != bp->tx_nr_rings &&









	    bp->hwrm_spec_code >= 0x10601)









		return true;



















	if (!BNXT_NEW_RM(bp))









		return false;









	}



















	vnic = bnxt_get_total_vnics(bp, rx);