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

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from Bluetooth and Wireless. No known outstanding
  regressions.

  Current release - regressions:

   - eth:
      - bonding: fix mii_status when slave is down
      - mlx5e: fix missing error assignment in mlx5e_xfrm_add_state()

  Previous releases - regressions:

   - sched: limit try_bulk_dequeue_skb() batches

   - ipv4: route: prevent rt_bind_exception() from rebinding stale fnhe

   - af_unix: initialise scc_index in unix_add_edge()

   - netpoll: fix incorrect refcount handling causing incorrect cleanup

   - bluetooth: don't hold spin lock over sleeping functions

   - hsr: Fix supervision frame sending on HSRv0

   - sctp: prevent possible shift out-of-bounds

   - tipc: fix use-after-free in tipc_mon_reinit_self().

   - dsa: tag_brcm: do not mark link local traffic as offloaded

   - eth: virtio-net: fix incorrect flags recording in big mode

  Previous releases - always broken:

   - sched: initialize struct tc_ife to fix kernel-infoleak

   - wifi:
      - mac80211: reject address change while connecting
      - iwlwifi: avoid toggling links due to wrong element use

   - bluetooth: cancel mesh send timer when hdev removed

   - strparser: fix signed/unsigned mismatch bug

   - handshake: fix memory leak in tls_handshake_accept()

  Misc:

   - selftests: mptcp: fix some flaky tests"

* tag 'net-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (60 commits)
  hsr: Follow standard for HSRv0 supervision frames
  hsr: Fix supervision frame sending on HSRv0
  virtio-net: fix incorrect flags recording in big mode
  ipv4: route: Prevent rt_bind_exception() from rebinding stale fnhe
  wifi: iwlwifi: mld: always take beacon ies in link grading
  wifi: iwlwifi: mvm: fix beacon template/fixed rate
  wifi: iwlwifi: fix aux ROC time event iterator usage
  net_sched: limit try_bulk_dequeue_skb() batches
  selftests: mptcp: join: properly kill background tasks
  selftests: mptcp: connect: trunc: read all recv data
  selftests: mptcp: join: userspace: longer transfer
  selftests: mptcp: join: endpoints: longer transfer
  selftests: mptcp: join: rm: set backup flag
  selftests: mptcp: connect: fix fallback note due to OoO
  ethtool: fix incorrect kernel-doc style comment in ethtool.h
  mlx5: Fix default values in create CQ
  Bluetooth: btrtl: Avoid loading the config file on security chips
  net/mlx5e: Fix potentially misleading debug message
  net/mlx5e: Fix wraparound in rate limiting for values above 255 Gbps
  net/mlx5e: Fix maxrate wraparound in threshold between units
  ...
parents 2ccec594 94909c53

Documentation/userspace-api/netlink/intro-specs.rst

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ Simple CLI 
Kernel comes with a simple CLI tool which should be useful when

developing Netlink related code. The tool is implemented in Python

and can use a YAML specification to issue Netlink requests

to the kernel. Only Generic Netlink is supported.

to the kernel.



The tool is located at ``tools/net/ynl/pyynl/cli.py``. It accepts

a handul of arguments, the most important ones are:

a handful of arguments, the most important ones are:



 - ``--spec`` - point to the spec file

 - ``--do $name`` / ``--dump $name`` - issue request ``$name``

drivers/bluetooth/btrtl.c

+13 −11
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


#define	RTL_CHIP_SUBVER (&(struct rtl_vendor_cmd) {{0x10, 0x38, 0x04, 0x28, 0x80}})

#define	RTL_CHIP_REV    (&(struct rtl_vendor_cmd) {{0x10, 0x3A, 0x04, 0x28, 0x80}})

#define	RTL_SEC_PROJ    (&(struct rtl_vendor_cmd) {{0x10, 0xA4, 0x0D, 0x00, 0xb0}})

#define	RTL_SEC_PROJ    (&(struct rtl_vendor_cmd) {{0x10, 0xA4, 0xAD, 0x00, 0xb0}})



#define RTL_PATCH_SNIPPETS		0x01

#define RTL_PATCH_DUMMY_HEADER		0x02
@@ -534,7 +534,6 @@ static int rtlbt_parse_firmware_v2(struct hci_dev *hdev, 
{

	struct rtl_epatch_header_v2 *hdr;

	int rc;

	u8 reg_val[2];

	u8 key_id;

	u32 num_sections;

	struct rtl_section *section;
@@ -549,14 +548,7 @@ static int rtlbt_parse_firmware_v2(struct hci_dev *hdev, 
		.len  = btrtl_dev->fw_len - 7, /* Cut the tail */

	};



	rc = btrtl_vendor_read_reg16(hdev, RTL_SEC_PROJ, reg_val);

	if (rc < 0)

		return -EIO;

	key_id = reg_val[0];



	rtl_dev_dbg(hdev, "%s: key id %u", __func__, key_id);



	btrtl_dev->key_id = key_id;

	key_id = btrtl_dev->key_id;



	hdr = rtl_iov_pull_data(&iov, sizeof(*hdr));

	if (!hdr)
@@ -1070,6 +1062,8 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, 
	u16 hci_rev, lmp_subver;

	u8 hci_ver, lmp_ver, chip_type = 0;

	int ret;

	int rc;

	u8 key_id;

	u8 reg_val[2];



	btrtl_dev = kzalloc(sizeof(*btrtl_dev), GFP_KERNEL);
@@ -1180,6 +1174,14 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, 
		goto err_free;

	}



	rc = btrtl_vendor_read_reg16(hdev, RTL_SEC_PROJ, reg_val);

	if (rc < 0)

		goto err_free;



	key_id = reg_val[0];

	btrtl_dev->key_id = key_id;

	rtl_dev_info(hdev, "%s: key id %u", __func__, key_id);



	btrtl_dev->fw_len = -EIO;

	if (lmp_subver == RTL_ROM_LMP_8852A && hci_rev == 0x000c) {

		snprintf(fw_name, sizeof(fw_name), "%s_v2.bin",
@@ -1202,7 +1204,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, 
		goto err_free;

	}



	if (btrtl_dev->ic_info->cfg_name) {

	if (btrtl_dev->ic_info->cfg_name && !btrtl_dev->key_id) {

		if (postfix) {

			snprintf(cfg_name, sizeof(cfg_name), "%s-%s.bin",

				 btrtl_dev->ic_info->cfg_name, postfix);

drivers/bluetooth/btusb.c

+6 −7
Original line number Diff line number Diff line
@@ -4361,6 +4361,11 @@ static void btusb_disconnect(struct usb_interface *intf) 


	hci_unregister_dev(hdev);



	if (data->oob_wake_irq)

		device_init_wakeup(&data->udev->dev, false);

	if (data->reset_gpio)

		gpiod_put(data->reset_gpio);



	if (intf == data->intf) {

		if (data->isoc)

			usb_driver_release_interface(&btusb_driver, data->isoc);
@@ -4371,17 +4376,11 @@ static void btusb_disconnect(struct usb_interface *intf) 
			usb_driver_release_interface(&btusb_driver, data->diag);

		usb_driver_release_interface(&btusb_driver, data->intf);

	} else if (intf == data->diag) {

		usb_driver_release_interface(&btusb_driver, data->intf);

		if (data->isoc)

			usb_driver_release_interface(&btusb_driver, data->isoc);

		usb_driver_release_interface(&btusb_driver, data->intf);

	}



	if (data->oob_wake_irq)

		device_init_wakeup(&data->udev->dev, false);



	if (data->reset_gpio)

		gpiod_put(data->reset_gpio);



	hci_free_dev(hdev);

}

drivers/infiniband/hw/mlx5/cq.c

+7 −4
Original line number Diff line number Diff line
@@ -1020,15 +1020,18 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	if (cq->create_flags & IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN)

		MLX5_SET(cqc, cqc, oi, 1);



	if (udata) {

		cq->mcq.comp = mlx5_add_cq_to_tasklet;

		cq->mcq.tasklet_ctx.comp = mlx5_ib_cq_comp;

	} else {

		cq->mcq.comp  = mlx5_ib_cq_comp;

	}



	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen, out, sizeof(out));

	if (err)

		goto err_cqb;



	mlx5_ib_dbg(dev, "cqn 0x%x\n", cq->mcq.cqn);

	if (udata)

		cq->mcq.tasklet_ctx.comp = mlx5_ib_cq_comp;

	else

		cq->mcq.comp  = mlx5_ib_cq_comp;

	cq->mcq.event = mlx5_ib_cq_event;



	INIT_LIST_HEAD(&cq->wc_list);

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
	/* check for initial state */

	new_slave->link = BOND_LINK_NOCHANGE;

	if (bond->params.miimon) {

		if (netif_carrier_ok(slave_dev)) {

		if (netif_running(slave_dev) && netif_carrier_ok(slave_dev)) {

			if (bond->params.updelay) {

				bond_set_slave_link_state(new_slave,

							  BOND_LINK_BACK,
@@ -2665,7 +2665,8 @@ static int bond_miimon_inspect(struct bonding *bond) 
	bond_for_each_slave_rcu(bond, slave, iter) {

		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);



		link_state = netif_carrier_ok(slave->dev);

		link_state = netif_running(slave->dev) &&

			     netif_carrier_ok(slave->dev);



		switch (slave->link) {

		case BOND_LINK_UP: