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

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from WiFi and netfilter.

  Most regressions addressed here come from quite old versions, with the
  exceptions of the iavf one and the WiFi fixes. No known outstanding
  reports or investigation.

  Fixes to fixes:

   - eth: iavf: in iavf_down, disable queues when removing the driver

  Previous releases - regressions:

   - sched: act_ct: additional checks for outdated flows

   - tcp: do not leave an empty skb in write queue

   - tcp: fix wrong RTO timeout when received SACK reneging

   - wifi: cfg80211: pass correct pointer to rdev_inform_bss()

   - eth: i40e: sync next_to_clean and next_to_process for programming
     status desc

   - eth: iavf: initialize waitqueues before starting watchdog_task

  Previous releases - always broken:

   - eth: r8169: fix data-races

   - eth: igb: fix potential memory leak in igb_add_ethtool_nfc_entry

   - eth: r8152: avoid writing garbage to the adapter's registers

   - eth: gtp: fix fragmentation needed check with gso"

* tag 'net-6.6-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (43 commits)
  iavf: in iavf_down, disable queues when removing the driver
  vsock/virtio: initialize the_virtio_vsock before using VQs
  net: ipv6: fix typo in comments
  net: ipv4: fix typo in comments
  net/sched: act_ct: additional checks for outdated flows
  netfilter: flowtable: GC pushes back packets to classic path
  i40e: Fix wrong check for I40E_TXR_FLAGS_WB_ON_ITR
  gtp: fix fragmentation needed check with gso
  gtp: uapi: fix GTPA_MAX
  Fix NULL pointer dereference in cn_filter()
  sfc: cleanup and reduce netlink error messages
  net/handshake: fix file ref count in handshake_nl_accept_doit()
  wifi: mac80211: don't drop all unprotected public action frames
  wifi: cfg80211: fix assoc response warning on failed links
  wifi: cfg80211: pass correct pointer to rdev_inform_bss()
  isdn: mISDN: hfcsusb: Spelling fix in comment
  tcp: fix wrong RTO timeout when received SACK reneging
  r8152: Block future register access if register access fails
  r8152: Rename RTL8152_UNPLUG to RTL8152_INACCESSIBLE
  r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
  ...
parents 611da07b 53798666

drivers/connector/cn_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int cn_filter(struct sock *dsk, struct sk_buff *skb, void *data) 
	enum proc_cn_mcast_op mc_op;

	uintptr_t val;



	if (!dsk || !data)

	if (!dsk || !dsk->sk_user_data || !data)

		return 0;



	ptr = (__u32 *)data;

drivers/isdn/hardware/mISDN/hfcsusb.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ ph_state(struct dchannel *dch) 
}



/*

 * disable/enable BChannel for desired protocoll

 * disable/enable BChannel for desired protocol

 */

static int

hfcsusb_setup_bch(struct bchannel *bch, int protocol)

drivers/net/ethernet/adi/adin1110.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int adin1110_read_fifo(struct adin1110_port_priv *port_priv) 
{

	struct adin1110_priv *priv = port_priv->priv;

	u32 header_len = ADIN1110_RD_HEADER_LEN;

	struct spi_transfer t;

	struct spi_transfer t = {0};

	u32 frame_size_no_fcs;

	struct sk_buff *rxb;

	u32 frame_size;

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2170,7 +2170,7 @@ static void xgene_enet_shutdown(struct platform_device *pdev) 
static struct platform_driver xgene_enet_driver = {

	.driver = {

		   .name = "xgene-enet",

		   .of_match_table = of_match_ptr(xgene_enet_of_match),

		   .of_match_table = xgene_enet_of_match,

		   .acpi_match_table = ACPI_PTR(xgene_enet_acpi_match),

	},

	.probe = xgene_enet_probe,

drivers/net/ethernet/chelsio/cxgb4/t4_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -3816,6 +3816,8 @@ int t4_load_phy_fw(struct adapter *adap, int win, 
		 FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD));

	ret = t4_set_params_timeout(adap, adap->mbox, adap->pf, 0, 1,

				    &param, &val, 30000);

	if (ret)

		return ret;



	/* If we have version number support, then check to see that the new

	 * firmware got loaded properly.