Commit ec681c53 authored Oct 14, 2021 by Linus Torvalds

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

Pull networking fixes from Jakub Kicinski:
 "Quite calm.

  The noisy DSA driver (embedded switches) changes, and adjustment to
  IPv6 IOAM behavior add to diffstat's bottom line but are not scary.

  Current release - regressions:

   - af_unix: rename UNIX-DGRAM to UNIX to maintain backwards
     compatibility

   - procfs: revert "add seq_puts() statement for dev_mcast", minor
     format change broke user space

  Current release - new code bugs:

   - dsa: fix bridge_num not getting cleared after ports leaving the
     bridge, resource leak

   - dsa: tag_dsa: send packets with TX fwd offload from VLAN-unaware
     bridges using VID 0, prevent packet drops if pvid is removed

   - dsa: mv88e6xxx: keep the pvid at 0 when VLAN-unaware, prevent HW
     getting confused about station to VLAN mapping

  Previous releases - regressions:

   - virtio-net: fix for skb_over_panic inside big mode

   - phy: do not shutdown PHYs in READY state

   - dsa: mv88e6xxx: don't use PHY_DETECT on internal PHY's, fix link
     LED staying lit after ifdown

   - mptcp: fix possible infinite wait on recvmsg(MSG_WAITALL)

   - mqprio: Correct stats in mqprio_dump_class_stats()

   - ice: fix deadlock for Tx timestamp tracking flush

   - stmmac: fix feature detection on old hardware

  Previous releases - always broken:

   - sctp: account stream padding length for reconf chunk

   - icmp: fix icmp_ext_echo_iio parsing in icmp_build_probe()

   - isdn: cpai: check ctr->cnr to avoid array index out of bound

   - isdn: mISDN: fix sleeping function called from invalid context

   - nfc: nci: fix potential UAF of rf_conn_info object

   - dsa: microchip: prevent ksz_mib_read_work from kicking back in
     after it's canceled in .remove and crashing

   - dsa: mv88e6xxx: isolate the ATU databases of standalone and bridged
     ports

   - dsa: sja1105, ocelot: break circular dependency between switch and
     tag drivers

   - dsa: felix: improve timestamping in presence of packe loss

   - mlxsw: thermal: fix out-of-bounds memory accesses

  Misc:

   - ipv6: ioam: move the check for undefined bits to improve
     interoperability"

* tag 'net-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (60 commits)
  icmp: fix icmp_ext_echo_iio parsing in icmp_build_probe
  MAINTAINERS: Update the devicetree documentation path of imx fec driver
  sctp: account stream padding length for reconf chunk
  mlxsw: thermal: Fix out-of-bounds memory accesses
  ethernet: s2io: fix setting mac address during resume
  NFC: digital: fix possible memory leak in digital_in_send_sdd_req()
  NFC: digital: fix possible memory leak in digital_tg_listen_mdaa()
  nfc: fix error handling of nfc_proto_register()
  Revert "net: procfs: add seq_puts() statement for dev_mcast"
  net: encx24j600: check error in devm_regmap_init_encx24j600
  net: korina: select CRC32
  net: arc: select CRC32
  net: dsa: felix: break at first CPU port during init and teardown
  net: dsa: tag_ocelot_8021q: fix inability to inject STP BPDUs into BLOCKING ports
  net: dsa: felix: purge skb from TX timestamping queue if it cannot be sent
  net: dsa: tag_ocelot_8021q: break circular dependency with ocelot switch lib
  net: dsa: tag_ocelot: break circular dependency with ocelot switch lib driver
  net: mscc: ocelot: cross-check the sequence id from the timestamp FIFO with the skb PTP header
  net: mscc: ocelot: deny TX timestamping of non-PTP packets
  net: mscc: ocelot: warn when a PTP IRQ is raised for an unknown skb
  ...

parents 26d65741 1fcd7945

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ select:
		contains:
		enum:
		- snps,dwmac
		- snps,dwmac-3.40a
		- snps,dwmac-3.50a
		- snps,dwmac-3.610
		- snps,dwmac-3.70a
		@@ -76,6 +77,7 @@ properties:
		- rockchip,rk3399-gmac
		- rockchip,rv1108-gmac
		- snps,dwmac
		- snps,dwmac-3.40a
		- snps,dwmac-3.50a
		- snps,dwmac-3.610
		- snps,dwmac-3.70a

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -7440,7 +7440,7 @@ FREESCALE IMX / MXC FEC DRIVER
		M: Joakim Zhang <qiangqing.zhang@nxp.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/net/fsl-fec.txt
		F: Documentation/devicetree/bindings/net/fsl,fec.yaml
		F: drivers/net/ethernet/freescale/fec.h
		F: drivers/net/ethernet/freescale/fec_main.c
		F: drivers/net/ethernet/freescale/fec_ptp.c
		@@ -11153,6 +11153,7 @@ S: Maintained
		F: Documentation/devicetree/bindings/net/dsa/marvell.txt
		F: Documentation/networking/devlink/mv88e6xxx.rst
		F: drivers/net/dsa/mv88e6xxx/
		F: include/linux/dsa/mv88e6xxx.h
		F: include/linux/platform_data/mv88e6xxx.h

		MARVELL ARMADA 3700 PHY DRIVERS

arch/arm/boot/dts/spear3xx.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@
		};

		gmac: eth@e0800000 {
		compatible = "st,spear600-gmac";
		compatible = "snps,dwmac-3.40a";
		reg = <0xe0800000 0x8000>;
		interrupts = <23 22>;
		interrupt-names = "macirq", "eth_wake_irq";

drivers/isdn/capi/kcapi.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -480,6 +480,11 @@ int detach_capi_ctr(struct capi_ctr *ctr)

		ctr_down(ctr, CAPI_CTR_DETACHED);

		if (ctr->cnr < 1 \|\| ctr->cnr - 1 >= CAPI_MAXCONTR) {
		err = -EINVAL;
		goto unlock_out;
		}

		if (capi_controller[ctr->cnr - 1] != ctr) {
		err = -EINVAL;
		goto unlock_out;

drivers/isdn/hardware/mISDN/netjet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -949,8 +949,8 @@ nj_release(struct tiger_hw *card)
		nj_disable_hwirq(card);
		mode_tiger(&card->bc[0], ISDN_P_NONE);
		mode_tiger(&card->bc[1], ISDN_P_NONE);
		card->isac.release(&card->isac);
		spin_unlock_irqrestore(&card->lock, flags);
		card->isac.release(&card->isac);
		release_region(card->base, card->base_s);
		card->base_s = 0;
		}