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

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bluetooth and wireless.

  Current release - new code bugs:

   - wifi: nl80211: disable multi-link reconfiguration

  Previous releases - regressions:

   - gso: fix ownership in __udp_gso_segment

   - wifi: iwlwifi:
      - fix A-MSDU TSO preparation
      - free pages allocated when failing to build A-MSDU

   - ipv6: fix dst ref loop in ila lwtunnel

   - mptcp: fix 'scheduling while atomic' in
     mptcp_pm_nl_append_new_local_addr

   - bluetooth: add check for mgmt_alloc_skb() in
     mgmt_device_connected()

   - ethtool: allow NULL nlattrs when getting a phy_device

   - eth: be2net: fix sleeping while atomic bugs in
     be_ndo_bridge_getlink

  Previous releases - always broken:

   - core: support TCP GSO case for a few missing flags

   - wifi: mac80211:
      - fix vendor-specific inheritance
      - cleanup sta TXQs on flush

   - llc: do not use skb_get() before dev_queue_xmit()

   - eth: ipa: nable checksum for IPA_ENDPOINT_AP_MODEM_{RX,TX}
     for v4.7"

* tag 'net-6.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (41 commits)
  net: ipv6: fix missing dst ref drop in ila lwtunnel
  net: ipv6: fix dst ref loop in ila lwtunnel
  mctp i3c: handle NULL header address
  net: dsa: mt7530: Fix traffic flooding for MMIO devices
  net-timestamp: support TCP GSO case for a few missing flags
  vlan: enforce underlying device type
  mptcp: fix 'scheduling while atomic' in mptcp_pm_nl_append_new_local_addr
  net: ethtool: netlink: Allow NULL nlattrs when getting a phy_device
  ppp: Fix KMSAN uninit-value warning with bpf
  net: ipa: Enable checksum for IPA_ENDPOINT_AP_MODEM_{RX,TX} for v4.7
  net: ipa: Fix QSB data for v4.7
  net: ipa: Fix v4.7 resource group names
  net: hns3: make sure ptp clock is unregister and freed if hclge_ptp_get_cycle returns an error
  wifi: nl80211: disable multi-link reconfiguration
  net: dsa: rtl8366rb: don't prompt users for LED control
  be2net: fix sleeping while atomic bugs in be_ndo_bridge_getlink
  llc: do not use skb_get() before dev_queue_xmit()
  wifi: cfg80211: regulatory: improve invalid hints checking
  caif_virtio: fix wrong pointer check in cfv_probe()
  net: gso: fix ownership in __udp_gso_segment
  ...
parents 1238f0af 5da15a9c

.mailmap

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com> 
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>

Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>

Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>

Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>

Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>

Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>

Archit Taneja <archit@ti.com>

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -3644,6 +3644,7 @@ static ssize_t force_poll_sync_write(struct file *file, 
}



static const struct file_operations force_poll_sync_fops = {

	.owner		= THIS_MODULE,

	.open		= simple_open,

	.read		= force_poll_sync_read,

	.write		= force_poll_sync_write,

drivers/net/caif/caif_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static int cfv_probe(struct virtio_device *vdev) 


	if (cfv->vr_rx)

		vdev->vringh_config->del_vrhs(cfv->vdev);

	if (cfv->vdev)

	if (cfv->vq_tx)

		vdev->config->del_vqs(cfv->vdev);

	free_netdev(netdev);

	return err;

drivers/net/dsa/mt7530.c

+2 −6
Original line number Diff line number Diff line
@@ -2591,7 +2591,8 @@ mt7531_setup_common(struct dsa_switch *ds) 
	if (ret < 0)

		return ret;



	return 0;

	/* Setup VLAN ID 0 for VLAN-unaware bridges */

	return mt7530_setup_vlan0(priv);

}



static int
@@ -2687,11 +2688,6 @@ mt7531_setup(struct dsa_switch *ds) 
	if (ret)

		return ret;



	/* Setup VLAN ID 0 for VLAN-unaware bridges */

	ret = mt7530_setup_vlan0(priv);

	if (ret)

		return ret;



	ds->assisted_learning_on_cpu_port = true;

	ds->mtu_enforcement_ingress = true;

drivers/net/dsa/realtek/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ config NET_DSA_REALTEK_RTL8366RB 
	  Select to enable support for Realtek RTL8366RB.



config NET_DSA_REALTEK_RTL8366RB_LEDS

	bool "Support RTL8366RB LED control"

	bool

	depends on (LEDS_CLASS=y || LEDS_CLASS=NET_DSA_REALTEK_RTL8366RB)

	depends on NET_DSA_REALTEK_RTL8366RB

	default NET_DSA_REALTEK_RTL8366RB