Commit 59f0c244 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - rxrpc: restore removed timer deletion

  Current release - new code bugs:

   - gre: fix device lookup for l3mdev use-case

   - xfrm: fix egress device lookup for l3mdev use-case

  Previous releases - regressions:

   - sched: cls_u32: fix netns refcount changes in u32_change()

   - smc: fix sock leak when release after smc_shutdown()

   - xfrm: limit skb_page_frag_refill use to a single page

   - eth: atlantic: invert deep par in pm functions, preventing null
     derefs

   - eth: stmmac: use readl_poll_timeout_atomic() in atomic state

  Previous releases - always broken:

   - gre: fix skb_under_panic on xmit

   - openvswitch: fix OOB access in reserve_sfa_size()

   - dsa: hellcreek: calculate checksums in tagger

   - eth: ice: fix crash in switchdev mode

   - eth: igc:
      - fix infinite loop in release_swfw_sync
      - fix scheduling while atomic"

* tag 'net-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (37 commits)
  drivers: net: hippi: Fix deadlock in rr_close()
  selftests: mlxsw: vxlan_flooding_ipv6: Prevent flooding of unwanted packets
  selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets
  nfc: MAINTAINERS: add Bug entry
  net: stmmac: Use readl_poll_timeout_atomic() in atomic state
  doc/ip-sysctl: add bc_forwarding
  netlink: reset network and mac headers in netlink_dump()
  net: mscc: ocelot: fix broken IP multicast flooding
  net: dsa: hellcreek: Calculate checksums in tagger
  net: atlantic: invert deep par in pm functions, preventing null derefs
  can: isotp: stop timeout monitoring when no first frame was sent
  bonding: do not discard lowest hash bit for non layer3+4 hashing
  net: lan966x: Make sure to release ptp interrupt
  ipv6: make ip6_rt_gc_expire an atomic_t
  net: Handle l3mdev in ip_tunnel_init_flow
  l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu
  net/sched: cls_u32: fix possible leak in u32_init_knode()
  net/sched: cls_u32: fix netns refcount changes in u32_change()
  powerpc: Update MAINTAINERS for ibmvnic and VAS
  net: restore alpha order to Ethernet devices in config
  ...
parents b2534357 bc6de287

Documentation/networking/ip-sysctl.rst

+7 −0
Original line number Diff line number Diff line
@@ -267,6 +267,13 @@ ipfrag_max_dist - INTEGER 
	from different IP datagrams, which could result in data corruption.

	Default: 64



bc_forwarding - INTEGER

	bc_forwarding enables the feature described in rfc1812#section-5.3.5.2

	and rfc2644. It allows the router to forward directed broadcast.

	To enable this feature, the 'all' entry and the input interface entry

	should be set to 1.

	Default: 0



INET peer storage

=================

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -9337,14 +9337,12 @@ F: drivers/pci/hotplug/rpaphp* 








IBM Power SRIOV Virtual NIC Device Driver









M:	Dany Madden <drt@linux.ibm.com>









M:	Sukadev Bhattiprolu <sukadev@linux.ibm.com>









R:	Thomas Falcon <tlfalcon@linux.ibm.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	drivers/net/ethernet/ibm/ibmvnic.*

















IBM Power Virtual Accelerator Switchboard









M:	Sukadev Bhattiprolu <sukadev@linux.ibm.com>









L:	linuxppc-dev@lists.ozlabs.org









S:	Supported









F:	arch/powerpc/include/asm/vas.h








@@ -13823,6 +13821,7 @@ M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>







L:	linux-nfc@lists.01.org (subscribers-only)









L:	netdev@vger.kernel.org









S:	Maintained









B:	mailto:linux-nfc@lists.01.org









F:	Documentation/devicetree/bindings/net/nfc/









F:	drivers/nfc/









F:	include/linux/platform_data/nfcmrvl.h
































drivers/net/bonding/bond_main.c



+9
−4






























Original line number
Diff line number
Diff line







@@ -4027,14 +4027,19 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb, const v







	return true;









}



















static u32 bond_ip_hash(u32 hash, struct flow_keys *flow)









static u32 bond_ip_hash(u32 hash, struct flow_keys *flow, int xmit_policy)









{









	hash ^= (__force u32)flow_get_u32_dst(flow) ^









		(__force u32)flow_get_u32_src(flow);









	hash ^= (hash >> 16);









	hash ^= (hash >> 8);



















	/* discard lowest hash bit to deal with the common even ports pattern */









	if (xmit_policy == BOND_XMIT_POLICY_LAYER34 ||









		xmit_policy == BOND_XMIT_POLICY_ENCAP34)









		return hash >> 1;



















	return hash;









}



















/* Generate hash based on xmit policy. If @skb is given it is used to linearize








@@ -4064,7 +4069,7 @@ static u32 __bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, const voi







			memcpy(&hash, &flow.ports.ports, sizeof(hash));









	}



















	return bond_ip_hash(hash, &flow);









	return bond_ip_hash(hash, &flow, bond->params.xmit_policy);









}



















/**








@@ -5259,7 +5264,7 @@ static u32 bond_sk_hash_l34(struct sock *sk)







	/* L4 */









	memcpy(&hash, &flow.ports.ports, sizeof(hash));









	/* L3 */









	return bond_ip_hash(hash, &flow);









	return bond_ip_hash(hash, &flow, BOND_XMIT_POLICY_LAYER34);









}



















static struct net_device *__bond_sk_get_lower_dev(struct bonding *bond,
































drivers/net/ethernet/Kconfig



+13
−13






























Original line number
Diff line number
Diff line







@@ -35,15 +35,6 @@ source "drivers/net/ethernet/aquantia/Kconfig"







source "drivers/net/ethernet/arc/Kconfig"









source "drivers/net/ethernet/asix/Kconfig"









source "drivers/net/ethernet/atheros/Kconfig"









source "drivers/net/ethernet/broadcom/Kconfig"









source "drivers/net/ethernet/brocade/Kconfig"









source "drivers/net/ethernet/cadence/Kconfig"









source "drivers/net/ethernet/calxeda/Kconfig"









source "drivers/net/ethernet/cavium/Kconfig"









source "drivers/net/ethernet/chelsio/Kconfig"









source "drivers/net/ethernet/cirrus/Kconfig"









source "drivers/net/ethernet/cisco/Kconfig"









source "drivers/net/ethernet/cortina/Kconfig"



















config CX_ECAT









	tristate "Beckhoff CX5020 EtherCAT master support"








@@ -57,6 +48,14 @@ config CX_ECAT







	  To compile this driver as a module, choose M here. The module









	  will be called ec_bhf.



















source "drivers/net/ethernet/broadcom/Kconfig"









source "drivers/net/ethernet/cadence/Kconfig"









source "drivers/net/ethernet/calxeda/Kconfig"









source "drivers/net/ethernet/cavium/Kconfig"









source "drivers/net/ethernet/chelsio/Kconfig"









source "drivers/net/ethernet/cirrus/Kconfig"









source "drivers/net/ethernet/cisco/Kconfig"









source "drivers/net/ethernet/cortina/Kconfig"









source "drivers/net/ethernet/davicom/Kconfig"



















config DNET








@@ -85,7 +84,6 @@ source "drivers/net/ethernet/huawei/Kconfig"







source "drivers/net/ethernet/i825xx/Kconfig"









source "drivers/net/ethernet/ibm/Kconfig"









source "drivers/net/ethernet/intel/Kconfig"









source "drivers/net/ethernet/microsoft/Kconfig"









source "drivers/net/ethernet/xscale/Kconfig"



















config JME








@@ -128,8 +126,9 @@ source "drivers/net/ethernet/mediatek/Kconfig"







source "drivers/net/ethernet/mellanox/Kconfig"









source "drivers/net/ethernet/micrel/Kconfig"









source "drivers/net/ethernet/microchip/Kconfig"









source "drivers/net/ethernet/moxa/Kconfig"









source "drivers/net/ethernet/mscc/Kconfig"









source "drivers/net/ethernet/microsoft/Kconfig"









source "drivers/net/ethernet/moxa/Kconfig"









source "drivers/net/ethernet/myricom/Kconfig"



















config FEALNX








@@ -141,10 +140,10 @@ config FEALNX







	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet









	  cards. <http://www.myson.com.tw/>



















source "drivers/net/ethernet/ni/Kconfig"









source "drivers/net/ethernet/natsemi/Kconfig"









source "drivers/net/ethernet/neterion/Kconfig"









source "drivers/net/ethernet/netronome/Kconfig"









source "drivers/net/ethernet/ni/Kconfig"









source "drivers/net/ethernet/8390/Kconfig"









source "drivers/net/ethernet/nvidia/Kconfig"









source "drivers/net/ethernet/nxp/Kconfig"








@@ -164,6 +163,7 @@ source "drivers/net/ethernet/packetengines/Kconfig"







source "drivers/net/ethernet/pasemi/Kconfig"









source "drivers/net/ethernet/pensando/Kconfig"









source "drivers/net/ethernet/qlogic/Kconfig"









source "drivers/net/ethernet/brocade/Kconfig"









source "drivers/net/ethernet/qualcomm/Kconfig"









source "drivers/net/ethernet/rdc/Kconfig"









source "drivers/net/ethernet/realtek/Kconfig"








@@ -171,10 +171,10 @@ source "drivers/net/ethernet/renesas/Kconfig"







source "drivers/net/ethernet/rocker/Kconfig"









source "drivers/net/ethernet/samsung/Kconfig"









source "drivers/net/ethernet/seeq/Kconfig"









source "drivers/net/ethernet/sfc/Kconfig"









source "drivers/net/ethernet/sgi/Kconfig"









source "drivers/net/ethernet/silan/Kconfig"









source "drivers/net/ethernet/sis/Kconfig"









source "drivers/net/ethernet/sfc/Kconfig"









source "drivers/net/ethernet/smsc/Kconfig"









source "drivers/net/ethernet/socionext/Kconfig"









source "drivers/net/ethernet/stmicro/Kconfig"
































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



+4
−4






























Original line number
Diff line number
Diff line







@@ -444,22 +444,22 @@ static int atl_resume_common(struct device *dev, bool deep)

















static int aq_pm_freeze(struct device *dev)









{









	return aq_suspend_common(dev, false);









	return aq_suspend_common(dev, true);









}



















static int aq_pm_suspend_poweroff(struct device *dev)









{









	return aq_suspend_common(dev, true);









	return aq_suspend_common(dev, false);









}



















static int aq_pm_thaw(struct device *dev)









{









	return atl_resume_common(dev, false);









	return atl_resume_common(dev, true);









}



















static int aq_pm_resume_restore(struct device *dev)









{









	return atl_resume_common(dev, true);









	return atl_resume_common(dev, false);









}



















static const struct dev_pm_ops aq_pm_ops = {