Commit 52afb15e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter, wireless and bluetooth.

  Nothing major, regression fixes are mostly in drivers, two more of
  those are flowing towards us thru various trees. I wish some of the
  changes went into -rc5, we'll try to keep an eye on frequency of PRs
  from sub-trees.

  Also disproportional number of fixes for bugs added in v6.4, strange
  coincidence.

  Current release - regressions:

   - igc: fix LED-related deadlock on driver unbind

   - wifi: mac80211: small fixes to recent clean up of the connection
     process

   - Revert "wifi: iwlwifi: bump FW API to 90 for BZ/SC devices", kernel
     doesn't have all the code to deal with that version, yet

   - Bluetooth:
       - set power_ctrl_enabled on NULL returned by gpiod_get_optional()
       - qca: fix invalid device address check, again

   - eth: ravb: fix registered interrupt names

  Current release - new code bugs:

   - wifi: mac80211: check EHT/TTLM action frame length

  Previous releases - regressions:

   - fix sk_memory_allocated_{add|sub} for architectures where
     __this_cpu_{add|sub}* are not IRQ-safe

   - dsa: mv88e6xx: fix link setup for 88E6250

  Previous releases - always broken:

   - ip: validate dev returned from __in_dev_get_rcu(), prevent possible
     null-derefs in a few places

   - switch number of for_each_rcu() loops using call_rcu() on the
     iterator to for_each_safe()

   - macsec: fix isolation of broadcast traffic in presence of offload

   - vxlan: drop packets from invalid source address

   - eth: mlxsw: trap and ACL programming fixes

   - eth: bnxt: PCIe error recovery fixes, fix counting dropped packets

   - Bluetooth:
       - lots of fixes for the command submission rework from v6.4
       - qca: fix NULL-deref on non-serdev suspend

  Misc:

   - tools: ynl: don't ignore errors in NLMSG_DONE messages"

* tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (88 commits)
  af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().
  net: b44: set pause params only when interface is up
  tls: fix lockless read of strp->msg_ready in ->poll
  dpll: fix dpll_pin_on_pin_register() for multiple parent pins
  net: ravb: Fix registered interrupt names
  octeontx2-af: fix the double free in rvu_npc_freemem()
  net: ethernet: ti: am65-cpts: Fix PTPv1 message type on TX packets
  ice: fix LAG and VF lock dependency in ice_reset_vf()
  iavf: Fix TC config comparison with existing adapter TC config
  i40e: Report MFS in decimal base instead of hex
  i40e: Do not use WQ_MEM_RECLAIM flag for workqueue
  net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()
  net/mlx5e: Advertise mlx5 ethernet driver updates sk_buff md_dst for MACsec
  macsec: Detect if Rx skb is macsec-related for offloading devices that update md_dst
  ethernet: Add helper for assigning packet type when dest address does not match device address
  macsec: Enable devices to advertise whether they update sk_buff md_dst during offloads
  net: phy: dp83869: Fix MII mode failure
  netfilter: nf_tables: honor table dormant flag from netdev release event path
  eth: bnxt: fix counting packets discarded due to OOM and netpoll
  igc: Fix LED-related deadlock on driver unbind
  ...
parents e33c4963 e8baa63f

.mailmap

+10 −0
Original line number Diff line number Diff line
@@ -38,6 +38,16 @@ Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com> 
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>

Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>

Alex Elder <elder@kernel.org>

Alex Elder <elder@kernel.org> <aelder@sgi.com>

Alex Elder <elder@kernel.org> <alex.elder@linaro.org>

Alex Elder <elder@kernel.org> <alex.elder@linary.org>

Alex Elder <elder@kernel.org> <elder@dreamhost.com>

Alex Elder <elder@kernel.org> <elder@dreawmhost.com>

Alex Elder <elder@kernel.org> <elder@ieee.org>

Alex Elder <elder@kernel.org> <elder@inktank.com>

Alex Elder <elder@kernel.org> <elder@linaro.org>

Alex Elder <elder@kernel.org> <elder@newdream.net>

Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>

Alex Shi <alexs@kernel.org> <alex.shi@intel.com>

Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -7829,9 +7829,8 @@ W: http://aeschi.ch.eu.org/efs/ 
F:	fs/efs/









EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER









M:	Douglas Miller <dougmill@linux.ibm.com>









L:	netdev@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/ethernet/ibm/ehea/

















ELM327 CAN NETWORK DRIVER
































drivers/bluetooth/btmtk.c



+3
−4






























Original line number
Diff line number
Diff line







@@ -380,8 +380,10 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)







	switch (data->cd_info.state) {









	case HCI_DEVCOREDUMP_IDLE:









		err = hci_devcd_init(hdev, MTK_COREDUMP_SIZE);









		if (err < 0)









		if (err < 0) {









			kfree_skb(skb);









			break;









		}









		data->cd_info.cnt = 0;



















		/* It is supposed coredump can be done within 5 seconds */








@@ -407,9 +409,6 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)







		break;









	}



















	if (err < 0)









		kfree_skb(skb);



















	return err;









}









EXPORT_SYMBOL_GPL(btmtk_process_coredump);
































drivers/bluetooth/btqca.c



+38
−0






























Original line number
Diff line number
Diff line







@@ -15,6 +15,8 @@

















#define VERSION "0.1"



















#define QCA_BDADDR_DEFAULT (&(bdaddr_t) {{ 0xad, 0x5a, 0x00, 0x00, 0x00, 0x00 }})



















int qca_read_soc_version(struct hci_dev *hdev, struct qca_btsoc_version *ver,









			 enum qca_btsoc_type soc_type)









{








@@ -612,6 +614,38 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)







}









EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);



















static int qca_check_bdaddr(struct hci_dev *hdev)









{









	struct hci_rp_read_bd_addr *bda;









	struct sk_buff *skb;









	int err;



















	if (bacmp(&hdev->public_addr, BDADDR_ANY))









		return 0;



















	skb = __hci_cmd_sync(hdev, HCI_OP_READ_BD_ADDR, 0, NULL,









			     HCI_INIT_TIMEOUT);









	if (IS_ERR(skb)) {









		err = PTR_ERR(skb);









		bt_dev_err(hdev, "Failed to read device address (%d)", err);









		return err;









	}



















	if (skb->len != sizeof(*bda)) {









		bt_dev_err(hdev, "Device address length mismatch");









		kfree_skb(skb);









		return -EIO;









	}



















	bda = (struct hci_rp_read_bd_addr *)skb->data;









	if (!bacmp(&bda->bdaddr, QCA_BDADDR_DEFAULT))









		set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);



















	kfree_skb(skb);



















	return 0;









}



















static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,









		struct qca_btsoc_version ver, u8 rom_ver, u16 bid)









{








@@ -818,6 +852,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,







		break;









	}



















	err = qca_check_bdaddr(hdev);









	if (err)









		return err;



















	bt_dev_info(hdev, "QCA setup on UART is completed");



















	return 0;
































drivers/bluetooth/btusb.c



+6
−5






























Original line number
Diff line number
Diff line







@@ -542,6 +542,8 @@ static const struct usb_device_id quirks_table[] = {







	/* Realtek 8852BE Bluetooth devices */









	{ USB_DEVICE(0x0cb8, 0xc559), .driver_info = BTUSB_REALTEK |









						     BTUSB_WIDEBAND_SPEECH },









	{ USB_DEVICE(0x0bda, 0x4853), .driver_info = BTUSB_REALTEK |









						     BTUSB_WIDEBAND_SPEECH },









	{ USB_DEVICE(0x0bda, 0x887b), .driver_info = BTUSB_REALTEK |









						     BTUSB_WIDEBAND_SPEECH },









	{ USB_DEVICE(0x0bda, 0xb85b), .driver_info = BTUSB_REALTEK |








@@ -3480,13 +3482,12 @@ static void btusb_dump_hdr_qca(struct hci_dev *hdev, struct sk_buff *skb)

















static void btusb_coredump_qca(struct hci_dev *hdev)









{









	int err;









	static const u8 param[] = { 0x26 };









	struct sk_buff *skb;



















	skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT);









	if (IS_ERR(skb))









		bt_dev_err(hdev, "%s: triggle crash failed (%ld)", __func__, PTR_ERR(skb));









	kfree_skb(skb);









	err = __hci_cmd_send(hdev, 0xfc0c, 1, param);









	if (err < 0)









		bt_dev_err(hdev, "%s: triggle crash failed (%d)", __func__, err);









}



















/*