Commit 35674e78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from can and ipsec subtrees.

  Current release - regressions:

   - sched: fix off by one in htb_activate_prios()

   - eth: mana: fix accessing freed irq affinity_hint

   - eth: ice: fix out-of-bounds KASAN warning in virtchnl

  Current release - new code bugs:

   - eth: mtk_eth_soc: enable special tag when any MAC uses DSA

  Previous releases - always broken:

   - core: fix sk->sk_txrehash default

   - neigh: make sure used and confirmed times are valid

   - mptcp: be careful on subflow status propagation on errors

   - xfrm: prevent potential spectre v1 gadget in xfrm_xlate32_attr()

   - phylink: move phy_device_free() to correctly release phy device

   - eth: mlx5:
      - fix crash unsetting rx-vlan-filter in switchdev mode
      - fix hang on firmware reset
      - serialize module cleanup with reload and remove"

* tag 'net-6.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits)
  selftests: forwarding: lib: quote the sysctl values
  net: mscc: ocelot: fix all IPv6 getting trapped to CPU when PTP timestamping is used
  rds: rds_rm_zerocopy_callback() use list_first_entry()
  net: txgbe: Update support email address
  selftests: Fix failing VXLAN VNI filtering test
  selftests: mptcp: stop tests earlier
  selftests: mptcp: allow more slack for slow test-case
  mptcp: be careful on subflow status propagation on errors
  mptcp: fix locking for in-kernel listener creation
  mptcp: fix locking for setsockopt corner-case
  mptcp: do not wait for bare sockets' timeout
  net: ethernet: mtk_eth_soc: fix DSA TX tag hwaccel for switch port 0
  nfp: ethtool: fix the bug of setting unsupported port speed
  txhash: fix sk->sk_txrehash default
  net: ethernet: mtk_eth_soc: fix wrong parameters order in __xdp_rxq_info_reg()
  net: ethernet: mtk_eth_soc: enable special tag when any MAC uses DSA
  net: sched: sch: Fix off by one in htb_activate_prios()
  igc: Add ndo_tx_timeout support
  net: mana: Fix accessing freed irq affinity_hint
  hv_netvsc: Allocate memory in netvsc_dma_map() with GFP_ATOMIC
  ...
parents 0b028189 3a082086

Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ Contents 


Support

=======

If you got any problem, contact Wangxun support team via support@trustnetic.com

If you got any problem, contact Wangxun support team via nic-support@net-swift.com

and Cc: netdev.

drivers/net/bonding/bond_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void bond_debug_reregister(struct bonding *bond) 


	d = debugfs_rename(bonding_debug_root, bond->debug_dir,

			   bonding_debug_root, bond->dev->name);

	if (d) {

	if (!IS_ERR(d)) {

		bond->debug_dir = d;

	} else {

		netdev_warn(bond->dev, "failed to reregister, so just unregister old one\n");

drivers/net/dsa/mt7530.c

+19 −7
Original line number Diff line number Diff line
@@ -1309,14 +1309,26 @@ mt7530_port_set_vlan_aware(struct dsa_switch *ds, int port) 
		if (!priv->ports[port].pvid)

			mt7530_rmw(priv, MT7530_PVC_P(port), ACC_FRM_MASK,

				   MT7530_VLAN_ACC_TAGGED);

	}



	/* Set the port as a user port which is to be able to recognize VID

	 * from incoming packets before fetching entry within the VLAN table.

		/* Set the port as a user port which is to be able to recognize

		 * VID from incoming packets before fetching entry within the

		 * VLAN table.

		 */

	mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK | PVC_EG_TAG_MASK,

		mt7530_rmw(priv, MT7530_PVC_P(port),

			   VLAN_ATTR_MASK | PVC_EG_TAG_MASK,

			   VLAN_ATTR(MT7530_VLAN_USER) |

			   PVC_EG_TAG(MT7530_VLAN_EG_DISABLED));

	} else {

		/* Also set CPU ports to the "user" VLAN port attribute, to

		 * allow VLAN classification, but keep the EG_TAG attribute as

		 * "consistent" (i.o.w. don't change its value) for packets

		 * received by the switch from the CPU, so that tagged packets

		 * are forwarded to user ports as tagged, and untagged as

		 * untagged.

		 */

		mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,

			   VLAN_ATTR(MT7530_VLAN_USER));

	}

}



static void

drivers/net/ethernet/cadence/macb_main.c

+16 −15
Original line number Diff line number Diff line
@@ -4627,7 +4627,6 @@ static int init_reset_optional(struct platform_device *pdev) 
		if (ret)

			return dev_err_probe(&pdev->dev, ret,

					     "failed to init SGMII PHY\n");

	}



		ret = zynqmp_pm_is_function_supported(PM_IOCTL, IOCTL_SET_GEM_CONFIG);

		if (!ret) {
@@ -4648,6 +4647,8 @@ static int init_reset_optional(struct platform_device *pdev) 
				goto err_out_phy_exit;

		}



	}



	/* Fully reset controller at hardware level if mapped in device tree */

	ret = device_reset_optional(&pdev->dev);

	if (ret) {

drivers/net/ethernet/intel/ice/ice_common.c

+4 −5
Original line number Diff line number Diff line
@@ -5524,7 +5524,7 @@ bool ice_fw_supports_report_dflt_cfg(struct ice_hw *hw) 
 * returned by the firmware is a 16 bit * value, but is indexed

 * by [fls(speed) - 1]

 */

static const u32 ice_aq_to_link_speed[15] = {

static const u32 ice_aq_to_link_speed[] = {

	SPEED_10,	/* BIT(0) */

	SPEED_100,

	SPEED_1000,
@@ -5536,10 +5536,6 @@ static const u32 ice_aq_to_link_speed[15] = { 
	SPEED_40000,

	SPEED_50000,

	SPEED_100000,	/* BIT(10) */

	0,

	0,

	0,

	0		/* BIT(14) */

};



/**
@@ -5550,5 +5546,8 @@ static const u32 ice_aq_to_link_speed[15] = { 
 */

u32 ice_get_link_speed(u16 index)

{

	if (index >= ARRAY_SIZE(ice_aq_to_link_speed))

		return 0;



	return ice_aq_to_link_speed[index];

}