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

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from Bluetooth, CAN and Netfilter.

  Current release - regressions:

   - two fixes for the netdev per-instance locking

   - batman-adv: fix double-hold of meshif when getting enabled

  Current release - new code bugs:

   - Bluetooth: increment TX timestamping tskey always for stream
     sockets

   - wifi: static analysis and build fixes for the new Intel sub-driver

  Previous releases - regressions:

   - net: fib_rules: fix iif / oif matching on L3 master (VRF) device

   - ipv6: add exception routes to GC list in rt6_insert_exception()

   - netfilter: conntrack: fix erroneous removal of offload bit

   - Bluetooth:
       - fix sending MGMT_EV_DEVICE_FOUND for invalid address
       - l2cap: process valid commands in too long frame
       - btnxpuart: Revert baudrate change in nxp_shutdown

  Previous releases - always broken:

   - ethtool: fix memory corruption during SFP FW flashing

   - eth:
       - hibmcge: fixes for link and MTU handling, pause frames etc
       - igc: fixes for PTM (PCIe timestamping)

   - dsa: b53: enable BPDU reception for management port

  Misc:

   - fixes for Netlink protocol schemas"

* tag 'net-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (81 commits)
  net: ethernet: mtk_eth_soc: revise QDMA packet scheduler settings
  net: ethernet: mtk_eth_soc: correct the max weight of the queue limit for 100Mbps
  net: ethernet: mtk_eth_soc: reapply mdc divider on reset
  net: ti: icss-iep: Fix possible NULL pointer dereference for perout request
  net: ti: icssg-prueth: Fix possible NULL pointer dereference inside emac_xmit_xdp_frame()
  net: ti: icssg-prueth: Fix kernel warning while bringing down network interface
  netfilter: conntrack: fix erronous removal of offload bit
  net: don't try to ops lock uninitialized devs
  ptp: ocp: fix start time alignment in ptp_ocp_signal_set
  net: dsa: avoid refcount warnings when ds->ops->tag_8021q_vlan_del() fails
  net: dsa: free routing table on probe failure
  net: dsa: clean up FDB, MDB, VLAN entries on unbind
  net: dsa: mv88e6xxx: fix -ENOENT when deleting VLANs and MST is unsupported
  net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered
  net: txgbe: fix memory leak in txgbe_probe() error path
  net: bridge: switchdev: do not notify new brentries as changed
  net: b53: enable BPDU reception for management port
  netlink: specs: rt-neigh: prefix struct nfmsg members with ndm
  netlink: specs: rt-link: adjust mctp attribute naming
  netlink: specs: rtnetlink: attribute naming corrections
  ...
parents 85a9793e 1b661241

Documentation/netlink/specs/ovs_vport.yaml

+1 −3
Original line number Diff line number Diff line
@@ -123,12 +123,12 @@ attribute-sets: 


operations:

  name-prefix: ovs-vport-cmd-

  fixed-header: ovs-header

  list:

    -

      name: new

      doc: Create a new OVS vport

      attribute-set: vport

      fixed-header: ovs-header

      do:

        request:

          attributes:
@@ -141,7 +141,6 @@ operations: 
      name: del

      doc: Delete existing OVS vport from a data path

      attribute-set: vport

      fixed-header: ovs-header

      do:

        request:

          attributes:
@@ -152,7 +151,6 @@ operations: 
      name: get

      doc: Get / dump OVS vport configuration and state

      attribute-set: vport

      fixed-header: ovs-header

      do: &vport-get-op

        request:

          attributes:

Documentation/netlink/specs/rt_link.yaml

+13 −7
Original line number Diff line number Diff line
@@ -1113,11 +1113,10 @@ attribute-sets: 
      -

        name: prop-list

        type: nest

        nested-attributes: link-attrs

        nested-attributes: prop-list-link-attrs

      -

        name: alt-ifname

        type: string

        multi-attr: true

      -

        name: perm-address

        type: binary
@@ -1163,6 +1162,13 @@ attribute-sets: 
      -

        name: netns-immutable

        type: u8

  -

    name: prop-list-link-attrs

    subset-of: link-attrs

    attributes:

      -

        name: alt-ifname

        multi-attr: true

  -

    name: af-spec-attrs

    attributes:
@@ -1585,7 +1591,7 @@ attribute-sets: 
        name: nf-call-iptables

        type: u8

      -

        name: nf-call-ip6-tables

        name: nf-call-ip6tables

        type: u8

      -

        name: nf-call-arptables
@@ -2077,7 +2083,7 @@ attribute-sets: 
        name: id

        type: u16

      -

        name: flag

        name: flags

        type: binary

        struct: ifla-vlan-flags

      -
@@ -2165,7 +2171,7 @@ attribute-sets: 
        type: binary

        struct: ifla-cacheinfo

      -

        name: icmp6-stats

        name: icmp6stats

        type: binary

        struct: ifla-icmp6-stats

      -
@@ -2179,9 +2185,10 @@ attribute-sets: 
        type: u32

  -

    name: mctp-attrs

    name-prefix: ifla-mctp-

    attributes:

      -

        name: mctp-net

        name: net

        type: u32

      -

        name: phys-binding
@@ -2453,7 +2460,6 @@ operations: 
            - min-mtu

            - max-mtu

            - prop-list

            - alt-ifname

            - perm-address

            - proto-down-reason

            - parent-dev-name

Documentation/netlink/specs/rt_neigh.yaml

+7 −7
Original line number Diff line number Diff line
@@ -13,25 +13,25 @@ definitions: 
    type: struct

    members:

      -

        name: family

        name: ndm-family

        type: u8

      -

        name: pad

        name: ndm-pad

        type: pad

        len: 3

      -

        name: ifindex

        name: ndm-ifindex

        type: s32

      -

        name: state

        name: ndm-state

        type: u16

        enum: nud-state

      -

        name: flags

        name: ndm-flags

        type: u8

        enum: ntf-flags

      -

        name: type

        name: ndm-type

        type: u8

        enum: rtm-type

  -
@@ -189,7 +189,7 @@ attribute-sets: 
        type: binary

        display-hint: ipv4

      -

        name: lladr

        name: lladdr

        type: binary

        display-hint: mac

      -

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6335,6 +6335,7 @@ F: Documentation/process/cve.rst 








CW1200 WLAN driver









S:	Orphan









L:	linux-wireless@vger.kernel.org









F:	drivers/net/wireless/st/









F:	include/linux/platform_data/net-cw1200.h
















@@ -14289,6 +14290,7 @@ S:	Odd fixes







F:	drivers/net/ethernet/marvell/sk*

















MARVELL LIBERTAS WIRELESS DRIVER









L:	linux-wireless@vger.kernel.org









L:	libertas-dev@lists.infradead.org









S:	Orphan









F:	drivers/net/wireless/marvell/libertas/








@@ -19752,6 +19754,7 @@ F:	drivers/media/tuners/qt1010*















QUALCOMM ATH12K WIRELESS DRIVER









M:	Jeff Johnson <jjohnson@kernel.org>









L:	linux-wireless@vger.kernel.org









L:	ath12k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath12k








@@ -19761,6 +19764,7 @@ N:	ath12k















QUALCOMM ATHEROS ATH10K WIRELESS DRIVER









M:	Jeff Johnson <jjohnson@kernel.org>









L:	linux-wireless@vger.kernel.org









L:	ath10k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath10k








@@ -19770,6 +19774,7 @@ N:	ath10k















QUALCOMM ATHEROS ATH11K WIRELESS DRIVER









M:	Jeff Johnson <jjohnson@kernel.org>









L:	linux-wireless@vger.kernel.org









L:	ath11k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k








@@ -22143,6 +22148,7 @@ F:	drivers/platform/x86/touchscreen_dmi.c















SILICON LABS WIRELESS DRIVERS (for WFxxx series)









M:	Jérôme Pouiller <jerome.pouiller@silabs.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml









F:	drivers/net/wireless/silabs/

























drivers/bluetooth/btnxpuart.c



+11
−10






























Original line number
Diff line number
Diff line







@@ -1286,7 +1286,9 @@ static void nxp_coredump(struct hci_dev *hdev)







	u8 pcmd = 2;



















	skb = nxp_drv_send_cmd(hdev, HCI_NXP_TRIGGER_DUMP, 1, &pcmd);









	if (!IS_ERR(skb))









	if (IS_ERR(skb))









		bt_dev_err(hdev, "Failed to trigger FW Dump. (%ld)", PTR_ERR(skb));









	else









		kfree_skb(skb);









}


















@@ -1445,9 +1447,6 @@ static int nxp_shutdown(struct hci_dev *hdev)







		/* HCI_NXP_IND_RESET command may not returns any response */









		if (!IS_ERR(skb))









			kfree_skb(skb);









	} else if (nxpdev->current_baudrate != nxpdev->fw_init_baudrate) {









		nxpdev->new_baudrate = nxpdev->fw_init_baudrate;









		nxp_set_baudrate_cmd(hdev, NULL);









	}



















	return 0;








@@ -1799,13 +1798,15 @@ static void nxp_serdev_remove(struct serdev_device *serdev)







		clear_bit(BTNXPUART_FW_DOWNLOADING, &nxpdev->tx_state);









		wake_up_interruptible(&nxpdev->check_boot_sign_wait_q);









		wake_up_interruptible(&nxpdev->fw_dnld_done_wait_q);









	}



















	if (test_bit(HCI_RUNNING, &hdev->flags)) {









		/* Ensure shutdown callback is executed before unregistering, so









		 * that baudrate is reset to initial value.









	} else {









		/* Restore FW baudrate to fw_init_baudrate if changed.









		 * This will ensure FW baudrate is in sync with









		 * driver baudrate in case this driver is re-inserted.









		 */









		nxp_shutdown(hdev);









		if (nxpdev->current_baudrate != nxpdev->fw_init_baudrate) {









			nxpdev->new_baudrate = nxpdev->fw_init_baudrate;









			nxp_set_baudrate_cmd(hdev, NULL);









		}









	}



















	ps_cleanup(nxpdev);