Commit 76657eae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter.

  Current release - regressions:

   - revert "tipc: use consistent GFP flags"

  Previous releases - regressions:

   - igb: fix deadlock caused by taking RTNL in runtime resume path

   - accept UFOv6 packages in virtio_net_hdr_to_skb

   - netfilter: fix regression in looped (broad|multi)cast's MAC
     handling

   - bridge: fix ioctl old_deviceless bridge argument

   - ice: xsk: do not clear status_error0 for ntu + nb_buffs descriptor,
     avoid stalls when multiple sockets use an interface

  Previous releases - always broken:

   - inet: fully convert sk->sk_rx_dst to RCU rules

   - veth: ensure skb entering GRO are not cloned

   - sched: fix zone matching for invalid conntrack state

   - bonding: fix ad_actor_system option setting to default

   - nf_tables: fix use-after-free in nft_set_catchall_destroy()

   - lantiq_xrx200: increase buffer reservation to avoid mem corruption

   - ice: xsk: avoid leaking app buffers during clean up

   - tun: avoid double free in tun_free_netdev"

* tag 'net-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (45 commits)
  net: stmmac: dwmac-visconti: Fix value of ETHER_CLK_SEL_FREQ_SEL_2P5M
  r8152: sync ocp base
  r8152: fix the force speed doesn't work for RTL8156
  net: bridge: fix ioctl old_deviceless bridge argument
  net: stmmac: ptp: fix potentially overflowing expression
  net: dsa: tag_ocelot: use traffic class to map priority on injected header
  veth: ensure skb entering GRO are not cloned.
  asix: fix wrong return value in asix_check_host_enable()
  asix: fix uninit-value in asix_mdio_read()
  sfc: falcon: Check null pointer of rx_queue->page_ring
  sfc: Check null pointer of rx_queue->page_ring
  net: ks8851: Check for error irq
  drivers: net: smc911x: Check for error irq
  fjes: Check for error irq
  bonding: fix ad_actor_system option setting to default
  igb: fix deadlock caused by taking RTNL in RPM resume path
  gve: Correct order of processing device options
  net: skip virtio_net_hdr_set_proto if protocol already set
  net: accept UFOv6 packages in virtio_net_hdr_to_skb
  docs: networking: replace skb_hwtstamp_tx with skb_tstamp_tx
  ...
parents 996a18eb 391e5975

Documentation/networking/bonding.rst

+6 −5
Original line number Diff line number Diff line
@@ -196,11 +196,12 @@ ad_actor_sys_prio 
ad_actor_system



	In an AD system, this specifies the mac-address for the actor in

	protocol packet exchanges (LACPDUs). The value cannot be NULL or

	multicast. It is preferred to have the local-admin bit set for this

	mac but driver does not enforce it. If the value is not given then

	system defaults to using the masters' mac address as actors' system

	address.

	protocol packet exchanges (LACPDUs). The value cannot be a multicast

	address. If the all-zeroes MAC is specified, bonding will internally

	use the MAC of the bond itself. It is preferred to have the

	local-admin bit set for this mac but driver does not enforce it. If

	the value is not given then system defaults to using the masters'

	mac address as actors' system address.



	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.

Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ PHY and allows physical transmission and reception of Ethernet frames. 
  IRQ config, enable, reset



DPNI (Datapath Network Interface)

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Contains TX/RX queues, network interface configuration, and RX buffer pool

configuration mechanisms.  The TX/RX queues are in memory and are identified

by queue number.

Documentation/networking/timestamping.rst

+2 −2
Original line number Diff line number Diff line
@@ -582,8 +582,8 @@ Time stamps for outgoing packets are to be generated as follows: 
  and hardware timestamping is not possible (SKBTX_IN_PROGRESS not set).

- As soon as the driver has sent the packet and/or obtained a

  hardware time stamp for it, it passes the time stamp back by

  calling skb_hwtstamp_tx() with the original skb, the raw

  hardware time stamp. skb_hwtstamp_tx() clones the original skb and

  calling skb_tstamp_tx() with the original skb, the raw

  hardware time stamp. skb_tstamp_tx() clones the original skb and

  adds the timestamps, therefore the original skb has to be freed now.

  If obtaining the hardware time stamp somehow fails, then the driver

  should not fall back to software time stamping. The rationale is that

drivers/net/bonding/bond_options.c

+1 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ static int bond_option_ad_actor_system_set(struct bonding *bond, 
		mac = (u8 *)&newval->value;

	}



	if (!is_valid_ether_addr(mac))

	if (is_multicast_ether_addr(mac))

		goto err;



	netdev_dbg(bond->dev, "Setting ad_actor_system to %pM\n", mac);

drivers/net/ethernet/google/gve/gve_adminq.c

+4 −4
Original line number Diff line number Diff line
@@ -738,10 +738,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) 
	 * is not set to GqiRda, choose the queue format in a priority order:

	 * DqoRda, GqiRda, GqiQpl. Use GqiQpl as default.

	 */

	if (priv->queue_format == GVE_GQI_RDA_FORMAT) {

		dev_info(&priv->pdev->dev,

			 "Driver is running with GQI RDA queue format.\n");

	} else if (dev_op_dqo_rda) {

	if (dev_op_dqo_rda) {

		priv->queue_format = GVE_DQO_RDA_FORMAT;

		dev_info(&priv->pdev->dev,

			 "Driver is running with DQO RDA queue format.\n");
@@ -753,6 +750,9 @@ int gve_adminq_describe_device(struct gve_priv *priv) 
			 "Driver is running with GQI RDA queue format.\n");

		supported_features_mask =

			be32_to_cpu(dev_op_gqi_rda->supported_features_mask);

	} else if (priv->queue_format == GVE_GQI_RDA_FORMAT) {

		dev_info(&priv->pdev->dev,

			 "Driver is running with GQI RDA queue format.\n");

	} else {

		priv->queue_format = GVE_GQI_QPL_FORMAT;

		if (dev_op_gqi_qpl)