Commit 5e837935 authored Jun 30, 2022 by Linus Torvalds

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

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

  Current release - new code bugs:

   - clear msg_get_inq in __sys_recvfrom() and __copy_msghdr_from_user()

   - mptcp:
      - invoke MP_FAIL response only when needed
      - fix shutdown vs fallback race
      - consistent map handling on failure

   - octeon_ep: use bitwise AND

  Previous releases - regressions:

   - tipc: move bc link creation back to tipc_node_create, fix NPD

  Previous releases - always broken:

   - tcp: add a missing nf_reset_ct() in 3WHS handling to prevent socket
     buffered skbs from keeping refcount on the conntrack module

   - ipv6: take care of disable_policy when restoring routes

   - tun: make sure to always disable and unlink NAPI instances

   - phy: don't trigger state machine while in suspend

   - netfilter: nf_tables: avoid skb access on nf_stolen

   - asix: fix "can't send until first packet is send" issue

   - usb: asix: do not force pause frames support

   - nxp-nci: don't issue a zero length i2c_master_read()

  Misc:

   - ncsi: allow use of proper "mellanox" DT vendor prefix

   - act_api: add a message for user space if any actions were already
     flushed before the error was hit"

* tag 'net-5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (55 commits)
  net: dsa: felix: fix race between reading PSFP stats and port stats
  selftest: tun: add test for NAPI dismantle
  net: tun: avoid disabling NAPI twice
  net: sparx5: mdb add/del handle non-sparx5 devices
  net: sfp: fix memory leak in sfp_probe()
  mlxsw: spectrum_router: Fix rollback in tunnel next hop init
  net: rose: fix UAF bugs caused by timer handler
  net: usb: ax88179_178a: Fix packet receiving
  net: bonding: fix use-after-free after 802.3ad slave unbind
  ipv6: fix lockdep splat in in6_dump_addrs()
  net: phy: ax88772a: fix lost pause advertisement configuration
  net: phy: Don't trigger state machine while in suspend
  usbnet: fix memory allocation in helpers
  selftests net: fix kselftest net fatal error
  NFC: nxp-nci: don't print header length mismatch on i2c error
  NFC: nxp-nci: Don't issue a zero length i2c_master_read()
  net: tipc: fix possible refcount leak in tipc_sk_create()
  nfc: nfcmrvl: Fix irq_of_parse_and_map() return value
  net: ipv6: unexport __init-annotated seg6_hmac_net_init()
  ipv6/sit: fix ipip6_tunnel_get_prl return value
  ...

parents 868f9f2f 58bf4db6

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -14397,9 +14397,8 @@ F: Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml
		F: sound/soc/codecs/tfa989x.c

		NXP-NCI NFC DRIVER
		R: Charles Gorand <charles.gorand@effinnov.com>
		L: linux-nfc@lists.01.org (subscribers-only)
		S: Supported
		S: Orphan
		F: Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
		F: drivers/nfc/nxp-nci

drivers/net/bonding/bond_3ad.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2228,6 +2228,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
		temp_aggregator->num_of_ports--;
		if (__agg_active_ports(temp_aggregator) == 0) {
		select_new_active_agg = temp_aggregator->is_active;
		if (temp_aggregator->num_of_ports == 0)
		ad_clear_agg(temp_aggregator);
		if (select_new_active_agg) {
		slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");

drivers/net/bonding/bond_alb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1302,12 +1302,12 @@ int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
		return res;

		if (rlb_enabled) {
		bond->alb_info.rlb_enabled = 1;
		res = rlb_initialize(bond);
		if (res) {
		tlb_deinitialize(bond);
		return res;
		}
		bond->alb_info.rlb_enabled = 1;
		} else {
		bond->alb_info.rlb_enabled = 0;
		}

drivers/net/dsa/bcm_sf2.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -878,6 +878,11 @@ static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,
		if (duplex == DUPLEX_FULL)
		reg \|= DUPLX_MODE;

		if (tx_pause)
		reg \|= TXFLOW_CNTL;
		if (rx_pause)
		reg \|= RXFLOW_CNTL;

		core_writel(priv, reg, offset);
		}

drivers/net/dsa/hirschmann/hellcreek_ptp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ static int hellcreek_led_setup(struct hellcreek *hellcreek)
		const char label, state;
		int ret = -EINVAL;

		of_node_get(hellcreek->dev->of_node);
		leds = of_find_node_by_name(hellcreek->dev->of_node, "leds");
		if (!leds) {
		dev_err(hellcreek->dev, "No LEDs specified in device tree!\n");