Commit 909b447d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes including fixes from can, xfrm, wireless,
  wireless-drivers and netfilter trees. Nothing scary, Intel
  WiFi-related fixes seemed most notable to the users.

  Current release - regressions:

   - dsa: microchip: ksz8795: fix KSZ8794 port map again to program the
     CPU port correctly

  Current release - new code bugs:

   - iwlwifi: pcie: reschedule in long-running memory reads

  Previous releases - regressions:

   - iwlwifi: dbg: don't try to overwrite read-only FW data

   - iwlwifi: provide gso_type to GSO packets

   - octeontx2: make sure the buffer is 128 byte aligned

   - tcp: make TCP_USER_TIMEOUT accurate for zero window probes

   - xfrm: fix wraparound in xfrm_policy_addr_delta()

   - xfrm: fix oops in xfrm_replay_advance_bmp due to a race between
     CPUs in presence of packet reorder

   - tcp: fix TLP timer not set when CA_STATE changes from DISORDER to
     OPEN

   - wext: fix NULL-ptr-dereference with cfg80211's lack of commit()

  Previous releases - always broken:

   - igc: fix link speed advertising

   - stmmac: configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA
     addressing

   - team: protect features update by RCU to avoid deadlock

   - xfrm: fix disable_xfrm sysctl when used on xfrm interfaces
     themselves

   - fec: fix temporary RMII clock reset on link up

   - can: dev: prevent potential information leak in can_fill_info()

  Misc:

   - mrp: fix bad packing of MRP test packet structures

   - uapi: fix big endian definition of ipv6_rpl_sr_hdr

   - add David Ahern to IPv4/IPv6 maintainers"

* tag 'net-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (86 commits)
  rxrpc: Fix memory leak in rxrpc_lookup_local
  mlxsw: spectrum_span: Do not overwrite policer configuration
  selftests: forwarding: Specify interface when invoking mausezahn
  stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing
  net: usb: cdc_ether: added support for Thales Cinterion PLSx3 modem family.
  ibmvnic: Ensure that CRQ entry read are correctly ordered
  MAINTAINERS: add missing header for bonding
  net: decnet: fix netdev refcount leaking on error path
  net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP
  can: dev: prevent potential information leak in can_fill_info()
  net: fec: Fix temporary RMII clock reset on link up
  net: lapb: Add locking to the lapb module
  team: protect features update by RCU to avoid deadlock
  MAINTAINERS: add David Ahern to IPv4/IPv6 maintainers
  net/mlx5: CT: Fix incorrect removal of tuple_nat_node from nat rhashtable
  net/mlx5e: Revert parameters on errors when changing MTU and LRO state without reset
  net/mlx5e: Revert parameters on errors when changing trust state without reset
  net/mlx5e: Correctly handle changing the number of queues when the interface is down
  net/mlx5e: Fix CT rule + encap slow path offload and deletion
  net/mlx5e: Disable hw-tc-offload when MLX5_CLS_ACT config is disabled
  ...
parents c64396cc b8323f72

Documentation/networking/ip-sysctl.rst

+12 −0
Original line number Diff line number Diff line
@@ -1807,12 +1807,24 @@ seg6_flowlabel - INTEGER 
``conf/default/*``:

	Change the interface-specific default settings.



	These settings would be used during creating new interfaces.





``conf/all/*``:

	Change all the interface-specific settings.



	[XXX:  Other special features than forwarding?]



conf/all/disable_ipv6 - BOOLEAN

	Changing this value is same as changing ``conf/default/disable_ipv6``

	setting and also all per-interface ``disable_ipv6`` settings to the same

	value.



	Reading this value does not have any particular meaning. It does not say

	whether IPv6 support is enabled or disabled. Returned value can be 1

	also in the case when some interface has ``disable_ipv6`` set to 0 and

	has configured IPv6 addresses.



conf/all/forwarding - BOOLEAN

	Enable global IPv6 forwarding between all interfaces.

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3239,6 +3239,7 @@ L: netdev@vger.kernel.org 
S:	Supported

W:	http://sourceforge.net/projects/bonding/

F:	drivers/net/bonding/

F:	include/net/bonding.h

F:	include/uapi/linux/if_bonding.h









BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER








@@ -12412,6 +12413,7 @@ F:	tools/testing/selftests/net/ipsec.c







NETWORKING [IPv4/IPv6]









M:	"David S. Miller" <davem@davemloft.net>









M:	Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>









M:	David Ahern <dsahern@kernel.org>









L:	netdev@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
































drivers/net/can/dev.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1163,7 +1163,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)







{









	struct can_priv *priv = netdev_priv(dev);









	struct can_ctrlmode cm = {.flags = priv->ctrlmode};









	struct can_berr_counter bec;









	struct can_berr_counter bec = { };









	enum can_state state = priv->state;



















	if (priv->do_get_state)
































drivers/net/dsa/bcm_sf2.c



+6
−2






























Original line number
Diff line number
Diff line







@@ -509,15 +509,19 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)







	/* Find our integrated MDIO bus node */









	dn = of_find_compatible_node(NULL, NULL, "brcm,unimac-mdio");









	priv->master_mii_bus = of_mdio_find_bus(dn);









	if (!priv->master_mii_bus)









	if (!priv->master_mii_bus) {









		of_node_put(dn);









		return -EPROBE_DEFER;









	}



















	get_device(&priv->master_mii_bus->dev);









	priv->master_mii_dn = dn;



















	priv->slave_mii_bus = devm_mdiobus_alloc(ds->dev);









	if (!priv->slave_mii_bus)









	if (!priv->slave_mii_bus) {









		of_node_put(dn);









		return -ENOMEM;









	}



















	priv->slave_mii_bus->priv = priv;









	priv->slave_mii_bus->name = "sf2 slave mii";
































drivers/net/dsa/microchip/ksz8795.c



+20
−10






























Original line number
Diff line number
Diff line







@@ -1187,6 +1187,20 @@ static const struct ksz_chip_data ksz8795_switch_chips[] = {







		.port_cnt = 5,		/* total cpu and user ports */









	},









	{









		/*









		 * WARNING









		 * =======









		 * KSZ8794 is similar to KSZ8795, except the port map









		 * contains a gap between external and CPU ports, the









		 * port map is NOT continuous. The per-port register









		 * map is shifted accordingly too, i.e. registers at









		 * offset 0x40 are NOT used on KSZ8794 and they ARE









		 * used on KSZ8795 for external port 3.









		 *           external  cpu









		 * KSZ8794   0,1,2      4









		 * KSZ8795   0,1,2,3    4









		 * KSZ8765   0,1,2,3    4









		 */









		.chip_id = 0x8794,









		.dev_name = "KSZ8794",









		.num_vlans = 4096,








@@ -1220,9 +1234,13 @@ static int ksz8795_switch_init(struct ksz_device *dev)







			dev->num_vlans = chip->num_vlans;









			dev->num_alus = chip->num_alus;









			dev->num_statics = chip->num_statics;









			dev->port_cnt = chip->port_cnt;









			dev->port_cnt = fls(chip->cpu_ports);









			dev->cpu_port = fls(chip->cpu_ports) - 1;









			dev->phy_port_cnt = dev->port_cnt - 1;









			dev->cpu_ports = chip->cpu_ports;



















			dev->host_mask = chip->cpu_ports;









			dev->port_mask = (BIT(dev->phy_port_cnt) - 1) |









					 chip->cpu_ports;









			break;









		}









	}








@@ -1231,17 +1249,9 @@ static int ksz8795_switch_init(struct ksz_device *dev)







	if (!dev->cpu_ports)









		return -ENODEV;



















	dev->port_mask = BIT(dev->port_cnt) - 1;









	dev->port_mask |= dev->host_mask;



















	dev->reg_mib_cnt = KSZ8795_COUNTER_NUM;









	dev->mib_cnt = ARRAY_SIZE(mib_names);



















	dev->phy_port_cnt = dev->port_cnt - 1;



















	dev->cpu_port = dev->port_cnt - 1;









	dev->host_mask = BIT(dev->cpu_port);



















	dev->ports = devm_kzalloc(dev->dev,









				  dev->port_cnt * sizeof(struct ksz_port),









				  GFP_KERNEL);