Commit 5abfdfd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  There is a recently notified BT regression with no fix yet. I do not
  think a fix will land in the next week.

  Current release - regressions:

   - core: tighten bad gso csum offset check in virtio_net_hdr

   - netfilter: move nf flowtable bpf initialization in
     nf_flow_table_module_init()

   - eth: ice: stop calling pci_disable_device() as we use pcim

   - eth: fou: fix null-ptr-deref in GRO.

  Current release - new code bugs:

   - hsr: prevent NULL pointer dereference in hsr_proxy_announce()

  Previous releases - regressions:

   - hsr: remove seqnr_lock

   - netfilter: nft_socket: fix sk refcount leaks

   - mptcp: pm: fix uaf in __timer_delete_sync

   - phy: dp83822: fix NULL pointer dereference on DP83825 devices

   - eth: revert "virtio_net: rx enable premapped mode by default"

   - eth: octeontx2-af: Modify SMQ flush sequence to drop packets

  Previous releases - always broken:

   - eth: mlx5: fix bridge mode operations when there are no VFs

   - eth: igb: Always call igb_xdp_ring_update_tail() under Tx lock"

* tag 'net-6.11-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (36 commits)
  net: netfilter: move nf flowtable bpf initialization in nf_flow_table_module_init()
  net: tighten bad gso csum offset check in virtio_net_hdr
  netlink: specs: mptcp: fix port endianness
  net: dpaa: Pad packets to ETH_ZLEN
  mptcp: pm: Fix uaf in __timer_delete_sync
  net: libwx: fix number of Rx and Tx descriptors
  net: dsa: felix: ignore pending status of TAS module when it's disabled
  net: hsr: prevent NULL pointer dereference in hsr_proxy_announce()
  selftests: mptcp: include net_helper.sh file
  selftests: mptcp: include lib.sh file
  selftests: mptcp: join: restrict fullmesh endp on 1st sf
  netfilter: nft_socket: make cgroupsv2 matching work with namespaces
  netfilter: nft_socket: fix sk refcount leaks
  MAINTAINERS: Add ethtool pse-pd to PSE NETWORK DRIVER
  dt-bindings: net: tja11xx: fix the broken binding
  selftests: net: csum: Fix checksums for packets with non-zero padding
  net: phy: dp83822: Fix NULL pointer dereference on DP83825 devices
  virtio_net: disable premapped mode by default
  Revert "virtio_net: big mode skip the unmap check"
  Revert "virtio_net: rx remove premapped failover code"
  ...
parents 42c5b519 3e705251

Documentation/devicetree/bindings/net/nxp,tja11xx.yaml

+46 −16
Original line number Diff line number Diff line
@@ -14,24 +14,38 @@ maintainers: 
description:

  Bindings for NXP TJA11xx automotive PHYs



properties:

  compatible:

    enum:

      - ethernet-phy-id0180.dc40

      - ethernet-phy-id0180.dc41

      - ethernet-phy-id0180.dc48

      - ethernet-phy-id0180.dd00

      - ethernet-phy-id0180.dd01

      - ethernet-phy-id0180.dd02

      - ethernet-phy-id0180.dc80

      - ethernet-phy-id0180.dc82

      - ethernet-phy-id001b.b010

      - ethernet-phy-id001b.b013

      - ethernet-phy-id001b.b030

      - ethernet-phy-id001b.b031



allOf:

  - $ref: ethernet-phy.yaml#



patternProperties:

  "^ethernet-phy@[0-9a-f]+$":

    type: object

    additionalProperties: false

    description: |

      Some packages have multiple PHYs. Secondary PHY should be defines as

      subnode of the first (parent) PHY.



  - if:

      properties:

      reg:

        minimum: 0

        maximum: 31

        description:

          The ID number for the child PHY. Should be +1 of parent PHY.

        compatible:

          contains:

            enum:

              - ethernet-phy-id0180.dc40

              - ethernet-phy-id0180.dc41

              - ethernet-phy-id0180.dc48

              - ethernet-phy-id0180.dd00

              - ethernet-phy-id0180.dd01

              - ethernet-phy-id0180.dd02



    then:

      properties:

        nxp,rmii-refclk-in:

          type: boolean

          description: |
@@ -48,6 +62,21 @@ patternProperties: 
            reference clock output when RMII mode enabled.

            Only supported on TJA1100 and TJA1101.



patternProperties:

  "^ethernet-phy@[0-9a-f]+$":

    type: object

    additionalProperties: false

    description: |

      Some packages have multiple PHYs. Secondary PHY should be defines as

      subnode of the first (parent) PHY.



    properties:

      reg:

        minimum: 0

        maximum: 31

        description:

          The ID number for the child PHY. Should be +1 of parent PHY.



    required:

      - reg
@@ -60,6 +89,7 @@ examples: 
        #size-cells = <0>;



        tja1101_phy0: ethernet-phy@4 {

            compatible = "ethernet-phy-id0180.dc40";

            reg = <0x4>;

            nxp,rmii-refclk-in;

        };

Documentation/netlink/specs/mptcp_pm.yaml

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ attribute-sets: 
      -

        name: port

        type: u16

        byte-order: big-endian

      -

        name: flags

        type: u32

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -18407,6 +18407,7 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	Documentation/devicetree/bindings/net/pse-pd/

F:	drivers/net/pse-pd/

F:	net/ethtool/pse-pd.c









PSTORE FILESYSTEM









M:	Kees Cook <kees@kernel.org>

























drivers/net/dsa/ocelot/felix_vsc9959.c



+7
−4






























Original line number
Diff line number
Diff line







@@ -1474,11 +1474,14 @@ static int vsc9959_qos_port_tas_set(struct ocelot *ocelot, int port,







	/* Hardware errata -  Admin config could not be overwritten if









	 * config is pending, need reset the TAS module









	 */









	val = ocelot_read_rix(ocelot, QSYS_TAG_CONFIG, port);









	if (val & QSYS_TAG_CONFIG_ENABLE) {









		val = ocelot_read(ocelot, QSYS_PARAM_STATUS_REG_8);









		if (val & QSYS_PARAM_STATUS_REG_8_CONFIG_PENDING) {









			ret = -EBUSY;









			goto err_reset_tc;









		}









	}



















	ocelot_rmw_rix(ocelot,









		       QSYS_TAG_CONFIG_ENABLE |
































drivers/net/ethernet/faraday/ftgmac100.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -84,7 +84,7 @@







			    FTGMAC100_INT_RPKT_BUF)



















/* All the interrupts we care about */









#define FTGMAC100_INT_ALL (FTGMAC100_INT_RPKT_BUF  |  \









#define FTGMAC100_INT_ALL (FTGMAC100_INT_RXTX  |  \









			   FTGMAC100_INT_BAD)



















/*