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

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from CAN, netfilter and wireless.

  We have an IPv6 routing regression with the relevant fix still a WiP.
  This includes a last-minute revert to avoid more problems.

  Current release - new code bugs:

   - wifi: nl80211: completely disable per-link stats for now

  Previous releases - regressions:

   - dev_ioctl: take ops lock in hwtstamp lower paths

   - netfilter:
       - fix spurious set lookup failures
       - fix lockdep splat due to missing annotation

   - genetlink: fix genl_bind() invoking bind() after -EPERM

   - phy: transfer phy_config_inband() locking responsibility to phylink

   - can: xilinx_can: fix use-after-free of transmitted SKB

   - hsr: fix lock warnings

   - eth:
       - igb: fix NULL pointer dereference in ethtool loopback test
       - i40e: fix Jumbo Frame support after iPXE boot
       - macsec: sync features on RTM_NEWLINK

  Previous releases - always broken:

   - tunnels: reset the GSO metadata before reusing the skb

   - mptcp: make sync_socket_options propagate SOCK_KEEPOPEN

   - can: j1939: implement NETDEV_UNREGISTER notification hanidler

   - wifi: ath12k: fix WMI TLV header misalignment"

* tag 'net-6.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (47 commits)
  Revert "net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups"
  hsr: hold rcu and dev lock for hsr_get_port_ndev
  hsr: use hsr_for_each_port_rtnl in hsr_port_get_hsr
  hsr: use rtnl lock when iterating over ports
  wifi: nl80211: completely disable per-link stats for now
  net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups
  net: ethtool: fix wrong type used in struct kernel_ethtool_ts_info
  MAINTAINERS: add Phil as netfilter reviewer
  netfilter: nf_tables: restart set lookup on base_seq change
  netfilter: nf_tables: make nft_set_do_lookup available unconditionally
  netfilter: nf_tables: place base_seq in struct net
  netfilter: nft_set_rbtree: continue traversal if element is inactive
  netfilter: nft_set_pipapo: don't check genbit from packetpath lookups
  netfilter: nft_set_bitmap: fix lockdep splat due to missing annotation
  can: rcar_can: rcar_can_resume(): fix s2ram with PSCI
  can: xilinx_can: xcan_write_frame(): fix use-after-free of transmitted SKB
  can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails
  can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed
  can: j1939: implement NETDEV_UNREGISTER notification handler
  selftests: can: enable CONFIG_CAN_VCAN as a module
  ...
parents e59a0391 63a79655

Documentation/netlink/specs/mptcp_pm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ attribute-sets: 
        type: u32

      -

        name: if-idx

        type: u32

        type: s32

      -

        name: reset-reason

        type: u32

Documentation/networking/can.rst

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ The broadcast manager sends responses to user space in the same form: 
            struct timeval ival1, ival2;    /* count and subsequent interval */

            canid_t can_id;                 /* unique can_id for task */

            __u32 nframes;                  /* number of can_frames following */

            struct can_frame frames[0];

            struct can_frame frames[];

    };



The aligned payload 'frames' uses the same basic CAN frame structure defined

Documentation/networking/mptcp.rst

+4 −4
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ address announcements. Typically, it is the client side that initiates subflows, 
and the server side that announces additional addresses via the ``ADD_ADDR`` and

``REMOVE_ADDR`` options.



Path managers are controlled by the ``net.mptcp.pm_type`` sysctl knob -- see

mptcp-sysctl.rst. There are two types: the in-kernel one (type ``0``) where the

same rules are applied for all the connections (see: ``ip mptcp``) ; and the

userspace one (type ``1``), controlled by a userspace daemon (i.e. `mptcpd

Path managers are controlled by the ``net.mptcp.path_manager`` sysctl knob --

see mptcp-sysctl.rst. There are two types: the in-kernel one (``kernel``) where

the same rules are applied for all the connections (see: ``ip mptcp``) ; and the

userspace one (``userspace``), controlled by a userspace daemon (i.e. `mptcpd

<https://mptcpd.mptcp.dev/>`_) where different rules can be applied for each

connection. The path managers can be controlled via a Netlink API; see

netlink_spec/mptcp_pm.rst.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17479,6 +17479,7 @@ NETFILTER 
M:	Pablo Neira Ayuso <pablo@netfilter.org>

M:	Jozsef Kadlecsik <kadlec@netfilter.org>

M:	Florian Westphal <fw@strlen.de>

R:	Phil Sutter <phil@nwl.cc>

L:	netfilter-devel@vger.kernel.org

L:	coreteam@netfilter.org

S:	Maintained

drivers/net/can/rcar/rcar_can.c

+1 −7
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ static int rcar_can_resume(struct device *dev) 
{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct rcar_can_priv *priv = netdev_priv(ndev);

	u16 ctlr;

	int err;



	if (!netif_running(ndev))
@@ -873,12 +872,7 @@ static int rcar_can_resume(struct device *dev) 
		return err;

	}



	ctlr = readw(&priv->regs->ctlr);

	ctlr &= ~RCAR_CAN_CTLR_SLPM;

	writew(ctlr, &priv->regs->ctlr);

	ctlr &= ~RCAR_CAN_CTLR_CANM;

	writew(ctlr, &priv->regs->ctlr);

	priv->can.state = CAN_STATE_ERROR_ACTIVE;

	rcar_can_start(ndev);



	netif_device_attach(ndev);

	netif_start_queue(ndev);