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

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from wireless, and bluetooth.

  No outstanding fires.

  Current release - regressions:

   - eth: atlantic: always deep reset on pm op, fix null-deref

  Current release - new code bugs:

   - rds: use maybe_get_net() when acquiring refcount on TCP sockets
     [refinement of a previous fix]

   - eth: ocelot: mark traps with a bool instead of guessing type based
     on list membership

  Previous releases - regressions:

   - net: fix skipping features in for_each_netdev_feature()

   - phy: micrel: fix null-derefs on suspend/resume and probe

   - bcmgenet: check for Wake-on-LAN interrupt probe deferral

  Previous releases - always broken:

   - ipv4: drop dst in multicast routing path, prevent leaks

   - ping: fix address binding wrt vrf

   - net: fix wrong network header length when BPF protocol translation
     is used on skbs with a fraglist

   - bluetooth: fix the creation of hdev->name

   - rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition

   - wifi: iwlwifi: iwl-dbg: use del_timer_sync() before freeing

   - wifi: ath11k: reduce the wait time of 11d scan and hw scan while
     adding an interface

   - mac80211: fix rx reordering with non explicit / psmp ack policy

   - mac80211: reset MBSSID parameters upon connection

   - nl80211: fix races in nl80211_set_tx_bitrate_mask()

   - tls: fix context leak on tls_device_down

   - sched: act_pedit: really ensure the skb is writable

   - batman-adv: don't skb_split skbuffs with frag_list

   - eth: ocelot: fix various issues with TC actions (null-deref; bad
     stats; ineffective drops; ineffective filter removal)"

* tag 'net-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (61 commits)
  tls: Fix context leak on tls_device_down
  net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe()
  net/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending
  net: dsa: bcm_sf2: Fix Wake-on-LAN with mac_link_down()
  mlxsw: Avoid warning during ip6gre device removal
  net: bcmgenet: Check for Wake-on-LAN interrupt probe deferral
  net: ethernet: mediatek: ppe: fix wrong size passed to memset()
  Bluetooth: Fix the creation of hdev->name
  i40e: i40e_main: fix a missing check on list iterator
  net/sched: act_pedit: really ensure the skb is writable
  s390/lcs: fix variable dereferenced before check
  s390/ctcm: fix potential memory leak
  s390/ctcm: fix variable dereferenced before check
  net: atlantic: verify hw_head_ lies within TX buffer ring
  net: atlantic: add check for MAX_SKB_FRAGS
  net: atlantic: reduce scope of is_rsc_complete
  net: atlantic: fix "frag[0] not initialized"
  net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
  net: phy: micrel: Fix incorrect variable type in micrel
  decnet: Use container_of() for struct dn_neigh casts
  ...
parents 0ac824f3 3740651b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>

Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -3571,8 +3571,9 @@ M: Andy Gospodarek <andy@greyhouse.net> 
L:	netdev@vger.kernel.org

S:	Supported

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

F:	Documentation/networking/bonding.rst

F:	drivers/net/bonding/

F:	include/net/bonding.h

F:	include/net/bond*

F:	include/uapi/linux/if_bonding.h









BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER








@@ -10131,7 +10132,7 @@ S:	Supported







F:	drivers/net/wireless/intel/iwlegacy/

















INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Luca Coelho <luciano.coelho@intel.com>









M:	Gregory Greenman <gregory.greenman@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
































drivers/net/dsa/bcm_sf2.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -809,6 +809,9 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,







	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);









	u32 reg, offset;



















	if (priv->wol_ports_mask & BIT(port))









		return;



















	if (port != core_readl(priv, CORE_IMP0_PRT_ID)) {









		if (priv->type == BCM4908_DEVICE_ID ||









		    priv->type == BCM7445_DEVICE_ID)
































drivers/net/dsa/ocelot/felix.c



+6
−1






























Original line number
Diff line number
Diff line







@@ -403,6 +403,7 @@ static int felix_update_trapping_destinations(struct dsa_switch *ds,







{









	struct ocelot *ocelot = ds->priv;









	struct felix *felix = ocelot_to_felix(ocelot);









	struct ocelot_vcap_block *block_vcap_is2;









	struct ocelot_vcap_filter *trap;









	enum ocelot_mask_mode mask_mode;









	unsigned long port_mask;








@@ -422,9 +423,13 @@ static int felix_update_trapping_destinations(struct dsa_switch *ds,







	/* We are sure that "cpu" was found, otherwise









	 * dsa_tree_setup_default_cpu() would have failed earlier.









	 */









	block_vcap_is2 = &ocelot->block[VCAP_IS2];



















	/* Make sure all traps are set up for that destination */









	list_for_each_entry(trap, &ocelot->traps, trap_list) {









	list_for_each_entry(trap, &block_vcap_is2->rules, list) {









		if (!trap->is_trap)









			continue;



















		/* Figure out the current trapping destination */









		if (using_tag_8021q) {









			/* Redirect to the tag_8021q CPU port. If timestamps
































drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -449,7 +449,7 @@ static int aq_pm_freeze(struct device *dev)

















static int aq_pm_suspend_poweroff(struct device *dev)









{









	return aq_suspend_common(dev, false);









	return aq_suspend_common(dev, true);









}



















static int aq_pm_thaw(struct device *dev)








@@ -459,7 +459,7 @@ static int aq_pm_thaw(struct device *dev)

















static int aq_pm_resume_restore(struct device *dev)









{









	return atl_resume_common(dev, false);









	return atl_resume_common(dev, true);









}



















static const struct dev_pm_ops aq_pm_ops = {