Commit 8e621c9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from IPsec and wireless.

  Previous releases - regressions:

   - prevent NULL deref in generic_hwtstamp_ioctl_lower(),
     newer APIs don't populate all the pointers in the request

   - phylink: add missing supported link modes for the fixed-link

   - mptcp: fix false positive warning in mptcp_pm_nl_rm_addr

  Previous releases - always broken:

   - openvswitch: remove never-working support for setting NSH fields

   - xfrm: number of fixes for error paths of xfrm_state creation/
     modification/deletion

   - xfrm: fixes for offload
      - fix the determination of the protocol of the inner packet
      - don't push locally generated packets directly to L2 tunnel
        mode offloading, they still need processing from the standard
        xfrm path

   - mptcp: fix a couple of corner cases in fallback and fastclose
     handling

   - wifi: rtw89: hw_scan: prevent connections from getting stuck,
     work around apparent bug in FW by tweaking messages we send

   - af_unix: fix duplicate data if PEEK w/ peek_offset needs to wait

   - veth: more robust handing of race to avoid txq getting stuck

   - eth: ps3_gelic_net: handle skb allocation failures"

* tag 'net-6.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (47 commits)
  vsock: Ignore signal/timeout on connect() if already established
  be2net: pass wrb_params in case of OS2BMC
  l2tp: reset skb control buffer on xmit
  net: dsa: microchip: lan937x: Fix RGMII delay tuning
  selftests: mptcp: add a check for 'add_addr_accepted'
  mptcp: fix address removal logic in mptcp_pm_nl_rm_addr
  selftests: mptcp: join: userspace: longer timeout
  selftests: mptcp: join: endpoints: longer timeout
  selftests: mptcp: join: fastclose: remove flaky marks
  mptcp: fix duplicate reset on fastclose
  mptcp: decouple mptcp fastclose from tcp close
  mptcp: do not fallback when OoO is present
  mptcp: fix premature close in case of fallback
  mptcp: avoid unneeded subflow-level drops
  mptcp: fix ack generation for fallback msk
  wifi: rtw89: hw_scan: Don't let the operating channel be last
  net: phylink: add missing supported link modes for the fixed-link
  selftest: af_unix: Add test for SO_PEEK_OFF.
  af_unix: Read sk_peek_offset() again after sleeping in unix_stream_read_generic().
  net/mlx5: Clean up only new IRQ glue on request_irq() failure
  ...
parents 23cb64fb 002541ef

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -9266,7 +9266,6 @@ M: Ido Schimmel <idosch@nvidia.com> 
L:	bridge@lists.linux.dev

L:	netdev@vger.kernel.org

S:	Maintained

W:	http://www.linuxfoundation.org/en/Net:Bridge

F:	include/linux/if_bridge.h

F:	include/uapi/linux/if_bridge.h

F:	include/linux/netfilter_bridge/

drivers/net/dsa/hirschmann/hellcreek_ptp.c

+12 −2
Original line number Diff line number Diff line
@@ -376,8 +376,18 @@ static int hellcreek_led_setup(struct hellcreek *hellcreek) 
		hellcreek_set_brightness(hellcreek, STATUS_OUT_IS_GM, 1);



	/* Register both leds */

	led_classdev_register(hellcreek->dev, &hellcreek->led_sync_good);

	led_classdev_register(hellcreek->dev, &hellcreek->led_is_gm);

	ret = led_classdev_register(hellcreek->dev, &hellcreek->led_sync_good);

	if (ret) {

		dev_err(hellcreek->dev, "Failed to register sync_good LED\n");

		goto out;

	}



	ret = led_classdev_register(hellcreek->dev, &hellcreek->led_is_gm);

	if (ret) {

		dev_err(hellcreek->dev, "Failed to register is_gm LED\n");

		led_classdev_unregister(&hellcreek->led_sync_good);

		goto out;

	}



	ret = 0;

drivers/net/dsa/microchip/lan937x_main.c

+1 −0
Original line number Diff line number Diff line
@@ -540,6 +540,7 @@ static void lan937x_set_tune_adj(struct ksz_device *dev, int port, 
	ksz_pread16(dev, port, reg, &data16);



	/* Update tune Adjust */

	data16 &= ~PORT_TUNE_ADJ;

	data16 |= FIELD_PREP(PORT_TUNE_ADJ, val);

	ksz_pwrite16(dev, port, reg, data16);

drivers/net/ethernet/airoha/airoha_ppe.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth, 
			if (!airoha_is_valid_gdm_port(eth, port))

				return -EINVAL;



			if (dsa_port >= 0)

			if (dsa_port >= 0 || eth->ports[1])

				pse_port = port->id == 4 ? FE_PSE_PORT_GDM4

							 : port->id;

			else

drivers/net/ethernet/emulex/benet/be_main.c

+4 −3
Original line number Diff line number Diff line
@@ -1296,7 +1296,8 @@ static void be_xmit_flush(struct be_adapter *adapter, struct be_tx_obj *txo) 
		(adapter->bmc_filt_mask & BMC_FILT_MULTICAST)



static bool be_send_pkt_to_bmc(struct be_adapter *adapter,

			       struct sk_buff **skb)

			       struct sk_buff **skb,

			       struct be_wrb_params *wrb_params)

{

	struct ethhdr *eh = (struct ethhdr *)(*skb)->data;

	bool os2bmc = false;
@@ -1360,7 +1361,7 @@ static bool be_send_pkt_to_bmc(struct be_adapter *adapter, 
	 * to BMC, asic expects the vlan to be inline in the packet.

	 */

	if (os2bmc)

		*skb = be_insert_vlan_in_pkt(adapter, *skb, NULL);

		*skb = be_insert_vlan_in_pkt(adapter, *skb, wrb_params);



	return os2bmc;

}
@@ -1387,7 +1388,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev) 
	/* if os2bmc is enabled and if the pkt is destined to bmc,

	 * enqueue the pkt a 2nd time with mgmt bit set.

	 */

	if (be_send_pkt_to_bmc(adapter, &skb)) {

	if (be_send_pkt_to_bmc(adapter, &skb, &wrb_params)) {

		BE_WRB_F_SET(wrb_params.features, OS2BMC, 1);

		wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);

		if (unlikely(!wrb_cnt))