Commit 6c2c7127 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  We'll have one more fix for a socket accounting regression, it's still
  getting polished. Otherwise things look fine.

  Current release - regressions:

   - revert "vrf: reset skb conntrack connection on VRF rcv", there are
     valid uses for previous behavior

   - can: m_can: fix iomap_read_fifo() and iomap_write_fifo()

  Current release - new code bugs:

   - mlx5: e-switch, return correct error code on group creation failure

  Previous releases - regressions:

   - sctp: fix transport encap_port update in sctp_vtag_verify

   - stmmac: fix E2E delay mechanism (in PTP timestamping)

  Previous releases - always broken:

   - netfilter: ip6t_rt: fix out-of-bounds read of ipv6_rt_hdr

   - netfilter: xt_IDLETIMER: fix out-of-bound read caused by lack of
     init

   - netfilter: ipvs: make global sysctl read-only in non-init netns

   - tcp: md5: fix selection between vrf and non-vrf keys

   - ipv6: count rx stats on the orig netdev when forwarding

   - bridge: mcast: use multicast_membership_interval for IGMPv3

   - can:
      - j1939: fix UAF for rx_kref of j1939_priv abort sessions on
        receiving bad messages

      - isotp: fix TX buffer concurrent access in isotp_sendmsg() fix
        return error on FC timeout on TX path

   - ice: fix re-init of RDMA Tx queues and crash if RDMA was not inited

   - hns3: schedule the polling again when allocation fails, prevent
     stalls

   - drivers: add missing of_node_put() when aborting
     for_each_available_child_of_node()

   - ptp: fix possible memory leak and UAF in ptp_clock_register()

   - e1000e: fix packet loss in burst mode on Tiger Lake and later

   - mlx5e: ipsec: fix more checksum offload issues"

* tag 'net-5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (75 commits)
  usbnet: sanity check for maxpacket
  net: enetc: make sure all traffic classes can send large frames
  net: enetc: fix ethtool counter name for PM0_TERR
  ptp: free 'vclock_index' in ptp_clock_release()
  sfc: Don't use netif_info before net_device setup
  sfc: Export fibre-specific supported link modes
  net/mlx5e: IPsec: Fix work queue entry ethernet segment checksum flags
  net/mlx5e: IPsec: Fix a misuse of the software parser's fields
  net/mlx5e: Fix vlan data lost during suspend flow
  net/mlx5: E-switch, Return correct error code on group creation failure
  net/mlx5: Lag, change multipath and bonding to be mutually exclusive
  ice: Add missing E810 device ids
  igc: Update I226_K device ID
  e1000e: Fix packet loss on Tiger Lake and later
  e1000e: Separate TGP board type from SPT
  ptp: Fix possible memory leak in ptp_clock_register()
  net: stmmac: Fix E2E delay mechanism
  nfc: st95hf: Make spi remove() callback return zero
  net: hns3: disable sriov before unload hclge layer
  net: hns3: fix vf reset workqueue cannot exit
  ...
parents 0a3221b6 397430b5

Documentation/networking/devlink/ice.rst

+5 −4
Original line number Diff line number Diff line
@@ -30,10 +30,11 @@ The ``ice`` driver reports the following versions 
        PHY, link, etc.

    * - ``fw.mgmt.api``

      - running

      - 1.5

      - 2-digit version number of the API exported over the AdminQ by the

        management firmware. Used by the driver to identify what commands

        are supported.

      - 1.5.1

      - 3-digit version number (major.minor.patch) of the API exported over

        the AdminQ by the management firmware. Used by the driver to

        identify what commands are supported. Historical versions of the

        kernel only displayed a 2-digit version number (major.minor).

    * - ``fw.mgmt.build``

      - running

      - 0x305d955f

Documentation/networking/mctp.rst

+5 −5
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ specified with a ``sockaddr`` type, with a single-byte endpoint address: 
    };



    struct sockaddr_mctp {

            unsigned short int	smctp_family;

            int			smctp_network;

            __kernel_sa_family_t smctp_family;

            unsigned int         smctp_network;

            struct mctp_addr     smctp_addr;

            __u8                 smctp_type;

            __u8                 smctp_tag;

drivers/isdn/hardware/mISDN/hfcpci.c

+4 −4
Original line number Diff line number Diff line
@@ -1994,14 +1994,14 @@ setup_hw(struct hfc_pci *hc) 
	pci_set_master(hc->pdev);

	if (!hc->irq) {

		printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");

		return 1;

		return -EINVAL;

	}

	hc->hw.pci_io =

		(char __iomem *)(unsigned long)hc->pdev->resource[1].start;



	if (!hc->hw.pci_io) {

		printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");

		return 1;

		return -ENOMEM;

	}

	/* Allocate memory for FIFOS */

	/* the memory needs to be on a 32k boundary within the first 4G */
@@ -2012,7 +2012,7 @@ setup_hw(struct hfc_pci *hc) 
	if (!buffer) {

		printk(KERN_WARNING

		       "HFC-PCI: Error allocating memory for FIFO!\n");

		return 1;

		return -ENOMEM;

	}

	hc->hw.fifos = buffer;

	pci_write_config_dword(hc->pdev, 0x80, hc->hw.dmahandle);
@@ -2022,7 +2022,7 @@ setup_hw(struct hfc_pci *hc) 
		       "HFC-PCI: Error in ioremap for PCI!\n");

		dma_free_coherent(&hc->pdev->dev, 0x8000, hc->hw.fifos,

				  hc->hw.dmahandle);

		return 1;

		return -ENOMEM;

	}



	printk(KERN_INFO

drivers/net/can/m_can/m_can_platform.c

+12 −2
Original line number Diff line number Diff line
@@ -32,8 +32,13 @@ static u32 iomap_read_reg(struct m_can_classdev *cdev, int reg) 
static int iomap_read_fifo(struct m_can_classdev *cdev, int offset, void *val, size_t val_count)

{

	struct m_can_plat_priv *priv = cdev_to_priv(cdev);

	void __iomem *src = priv->mram_base + offset;



	ioread32_rep(priv->mram_base + offset, val, val_count);

	while (val_count--) {

		*(unsigned int *)val = ioread32(src);

		val += 4;

		src += 4;

	}



	return 0;

}
@@ -51,8 +56,13 @@ static int iomap_write_fifo(struct m_can_classdev *cdev, int offset, 
			    const void *val, size_t val_count)

{

	struct m_can_plat_priv *priv = cdev_to_priv(cdev);

	void __iomem *dst = priv->mram_base + offset;



	iowrite32_rep(priv->base + offset, val, val_count);

	while (val_count--) {

		iowrite32(*(unsigned int *)val, dst);

		val += 4;

		dst += 4;

	}



	return 0;

}

drivers/net/can/rcar/rcar_can.c

+12 −8
Original line number Diff line number Diff line
@@ -846,10 +846,12 @@ static int __maybe_unused rcar_can_suspend(struct device *dev) 
	struct rcar_can_priv *priv = netdev_priv(ndev);

	u16 ctlr;



	if (netif_running(ndev)) {

	if (!netif_running(ndev))

		return 0;



	netif_stop_queue(ndev);

	netif_device_detach(ndev);

	}



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

	ctlr |= RCAR_CAN_CTLR_CANM_HALT;

	writew(ctlr, &priv->regs->ctlr);
@@ -868,6 +870,9 @@ static int __maybe_unused rcar_can_resume(struct device *dev) 
	u16 ctlr;

	int err;



	if (!netif_running(ndev))

		return 0;



	err = clk_enable(priv->clk);

	if (err) {

		netdev_err(ndev, "clk_enable() failed, error %d\n", err);
@@ -881,10 +886,9 @@ static int __maybe_unused rcar_can_resume(struct device *dev) 
	writew(ctlr, &priv->regs->ctlr);

	priv->can.state = CAN_STATE_ERROR_ACTIVE;



	if (netif_running(ndev)) {

	netif_device_attach(ndev);

	netif_start_queue(ndev);

	}



	return 0;

}