Commit 07d6bf63 authored Oct 17, 2024 by Linus Torvalds

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

Pull networking fixes from Paolo Abeni:
 "Current release - new code bugs:

   - eth: mlx5: HWS, don't destroy more bwc queue locks than allocated

  Previous releases - regressions:

   - ipv4: give an IPv4 dev to blackhole_netdev

   - udp: compute L4 checksum as usual when not segmenting the skb

   - tcp/dccp: don't use timer_pending() in reqsk_queue_unlink().

   - eth: mlx5e: don't call cleanup on profile rollback failure

   - eth: microchip: vcap api: fix memory leaks in
     vcap_api_encode_rule_test()

   - eth: enetc: disable Tx BD rings after they are empty

   - eth: macb: avoid 20s boot delay by skipping MDIO bus registration
     for fixed-link PHY

  Previous releases - always broken:

   - posix-clock: fix missing timespec64 check in pc_clock_settime()

   - genetlink: hold RCU in genlmsg_mcast()

   - mptcp: prevent MPC handshake on port-based signal endpoints

   - eth: vmxnet3: fix packet corruption in vmxnet3_xdp_xmit_frame

   - eth: stmmac: dwmac-tegra: fix link bring-up sequence

   - eth: bcmasp: fix potential memory leak in bcmasp_xmit()

  Misc:

   - add Andrew Lunn as a co-maintainer of all networking drivers"

* tag 'net-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (47 commits)
  net/mlx5e: Don't call cleanup on profile rollback failure
  net/mlx5: Unregister notifier on eswitch init failure
  net/mlx5: Fix command bitmask initialization
  net/mlx5: Check for invalid vector index on EQ creation
  net/mlx5: HWS, use lock classes for bwc locks
  net/mlx5: HWS, don't destroy more bwc queue locks than allocated
  net/mlx5: HWS, fixed double free in error flow of definer layout
  net/mlx5: HWS, removed wrong access to a number of rules variable
  mptcp: pm: fix UaF read in mptcp_pm_nl_rm_addr_or_subflow
  net: ethernet: mtk_eth_soc: fix memory corruption during fq dma init
  vmxnet3: Fix packet corruption in vmxnet3_xdp_xmit_frame
  net: dsa: vsc73xx: fix reception from VLAN-unaware bridges
  net: ravb: Only advertise Rx/Tx timestamps if hardware supports it
  net: microchip: vcap api: Fix memory leaks in vcap_api_encode_rule_test()
  net: phy: mdio-bcm-unimac: Add BCM6846 support
  dt-bindings: net: brcm,unimac-mdio: Add bcm6846-mdio
  udp: Compute L4 checksum as usual when not segmenting the skb
  genetlink: hold RCU in genlmsg_mcast()
  net: dsa: mv88e6xxx: Fix the max_vid definition for the MV88E6361
  tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink().
  ...

parents c964ced7 cb560795

Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ properties:
		- brcm,asp-v2.1-mdio
		- brcm,asp-v2.2-mdio
		- brcm,unimac-mdio
		- brcm,bcm6846-mdio

		reg:
		minItems: 1

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -16086,6 +16086,7 @@ F: include/uapi/linux/net_dropmon.h
		F: net/core/drop_monitor.c

		NETWORKING DRIVERS
		M: Andrew Lunn <andrew+netdev@lunn.ch>
		M: "David S. Miller" <davem@davemloft.net>
		M: Eric Dumazet <edumazet@google.com>
		M: Jakub Kicinski <kuba@kernel.org>

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6347,7 +6347,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.invalid_port_mask = BIT(1) \| BIT(2) \| BIT(8),
		.num_internal_phys = 5,
		.internal_phys_offset = 3,
		.max_vid = 4095,
		.max_vid = 8191,
		.max_sid = 63,
		.port_base_addr = 0x0,
		.phy_base_addr = 0x0,

drivers/net/dsa/vitesse-vsc73xx-core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -851,7 +851,6 @@ static int vsc73xx_setup(struct dsa_switch *ds)

		dev_info(vsc->dev, "set up the switch\n");

		ds->untag_bridge_pvid = true;
		ds->max_num_bridges = DSA_TAG_8021Q_MAX_NUM_BRIDGES;
		ds->fdb_isolation = true;

drivers/net/ethernet/aeroflex/greth.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff skb, struct net_device dev)

		if (unlikely(skb->len > MAX_FRAME_SIZE)) {
		dev->stats.tx_errors++;
		goto out;
		goto len_error;
		}

		/* Save skb pointer. */
		@@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff skb, struct net_device dev)
		map_error:
		if (net_ratelimit())
		dev_warn(greth->dev, "Could not create TX DMA mapping\n");
		len_error:
		dev_kfree_skb(skb);
		out:
		return err;