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

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.10-rc7, including fixes from bpf, netfilter,
  wireless drivers, wireless mesh and can.

  Current release - regressions:

   - mt76: usb: fix crash on device removal

  Current release - always broken:

   - xsk: Fix umem cleanup from wrong context in socket destruct

  Previous release - regressions:

   - net: ip6_gre: set dev->hard_header_len when using header_ops

   - ipv4: Fix TOS mask in inet_rtm_getroute()

   - net, xsk: Avoid taking multiple skbuff references

  Previous release - always broken:

   - net/x25: prevent a couple of overflows

   - netfilter: ipset: prevent uninit-value in hash_ip6_add

   - geneve: pull IP header before ECN decapsulation

   - mpls: ensure LSE is pullable in TC and openvswitch paths

   - vxlan: respect needed_headroom of lower device

   - batman-adv: Consider fragmentation for needed packet headroom

   - can: drivers: don't count arbitration loss as an error

   - netfilter: bridge: reset skb->pkt_type after POST_ROUTING traversal

   - inet_ecn: Fix endianness of checksum update when setting ECT(1)

   - ibmvnic: fix various corner cases around reset handling

   - net/mlx5: fix rejecting unsupported Connect-X6DX SW steering

   - net/mlx5: Enforce HW TX csum offload with kTLS"

* tag 'net-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (62 commits)
  net/mlx5: DR, Proper handling of unsupported Connect-X6DX SW steering
  net/mlx5e: kTLS, Enforce HW TX csum offload with kTLS
  net: mlx5e: fix fs_tcp.c build when IPV6 is not enabled
  net/mlx5: Fix wrong address reclaim when command interface is down
  net/sched: act_mpls: ensure LSE is pullable before reading it
  net: openvswitch: ensure LSE is pullable before reading it
  net: skbuff: ensure LSE is pullable before decrementing the MPLS ttl
  net: mvpp2: Fix error return code in mvpp2_open()
  chelsio/chtls: fix a double free in chtls_setkey()
  rtw88: debug: Fix uninitialized memory in debugfs code
  vxlan: fix error return code in __vxlan_dev_create()
  net: pasemi: fix error return code in pasemi_mac_open()
  cxgb3: fix error return code in t3_sge_alloc_qset()
  net/x25: prevent a couple of overflows
  dpaa_eth: copy timestamp fields to new skb in A-050385 workaround
  net: ip6_gre: set dev->hard_header_len when using header_ops
  mt76: usb: fix crash on device removal
  iwlwifi: pcie: add some missing entries for AX210
  iwlwifi: pcie: invert values of NO_160 device config entries
  iwlwifi: pcie: add one missing entry for AX210
  ...
parents fee5be18 6f076ce6

Documentation/devicetree/bindings/net/can/tcan4x5x.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ tcan4x5x: tcan4x5x@0 { 
		spi-max-frequency = <10000000>;

		bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;

		interrupt-parent = <&gpio1>;

		interrupts = <14 GPIO_ACTIVE_LOW>;

		interrupts = <14 IRQ_TYPE_LEVEL_LOW>;

		device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		device-wake-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2): 
		clock-frequency = <100000>;



		interrupt-parent = <&gpio1>;

		interrupts = <29 GPIO_ACTIVE_HIGH>;

		interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;



		enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/net/nfc/pn544.txt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2): 
		clock-frequency = <400000>;



		interrupt-parent = <&gpio1>;

		interrupts = <17 GPIO_ACTIVE_HIGH>;

		interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;



		enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

MAINTAINERS

+21 −5
Original line number Diff line number Diff line
@@ -3357,6 +3357,17 @@ S: Supported 
F:	arch/x86/net/

X:	arch/x86/net/bpf_jit_comp32.c









BPF LSM (Security Audit and Enforcement using BPF)









M:	KP Singh <kpsingh@chromium.org>









R:	Florent Revest <revest@chromium.org>









R:	Brendan Jackman <jackmanb@chromium.org>









L:	bpf@vger.kernel.org









S:	Maintained









F:	Documentation/bpf/bpf_lsm.rst









F:	include/linux/bpf_lsm.h









F:	kernel/bpf/bpf_lsm.c









F:	security/bpf/

















BROADCOM B44 10/100 ETHERNET DRIVER









M:	Michael Chan <michael.chan@broadcom.com>









L:	netdev@vger.kernel.org








@@ -9069,10 +9080,7 @@ S:	Supported







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

















INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Johannes Berg <johannes.berg@intel.com>









M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>









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









M:	Intel Linux Wireless <linuxwifi@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









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








@@ -19114,12 +19122,17 @@ L:	netdev@vger.kernel.org







L:	bpf@vger.kernel.org









S:	Supported









F:	include/net/xdp.h









F:	include/net/xdp_priv.h









F:	include/trace/events/xdp.h









F:	kernel/bpf/cpumap.c









F:	kernel/bpf/devmap.c









F:	net/core/xdp.c









N:	xdp









K:	xdp









F:	samples/bpf/xdp*









F:	tools/testing/selftests/bpf/*xdp*









F:	tools/testing/selftests/bpf/*/*xdp*









F:	drivers/net/ethernet/*/*/*/*/*xdp*









F:	drivers/net/ethernet/*/*/*xdp*









K:	(?:\b|_)xdp(?:\b|_)

















XDP SOCKETS (AF_XDP)









M:	Björn Töpel <bjorn.topel@intel.com>








@@ -19128,9 +19141,12 @@ R:	Jonathan Lemon <jonathan.lemon@gmail.com>







L:	netdev@vger.kernel.org









L:	bpf@vger.kernel.org









S:	Maintained









F:	Documentation/networking/af_xdp.rst









F:	include/net/xdp_sock*









F:	include/net/xsk_buff_pool.h









F:	include/uapi/linux/if_xdp.h









F:	include/uapi/linux/xdp_diag.h









F:	include/net/netns/xdp.h









F:	net/xdp/









F:	samples/bpf/xdpsock*









F:	tools/lib/bpf/xsk*

























drivers/net/can/c_can/c_can.c



+14
−4






























Original line number
Diff line number
Diff line







@@ -1295,13 +1295,23 @@ int c_can_power_up(struct net_device *dev)







				time_after(time_out, jiffies))









		cpu_relax();



















	if (time_after(jiffies, time_out))









		return -ETIMEDOUT;









	if (time_after(jiffies, time_out)) {









		ret = -ETIMEDOUT;









		goto err_out;









	}



















	ret = c_can_start(dev);









	if (!ret)









	if (ret)









		goto err_out;



















	c_can_irq_control(priv, true);



















	return 0;



















err_out:









	c_can_reset_ram(priv, false);









	c_can_pm_runtime_put_sync(priv);



















	return ret;









}









EXPORT_SYMBOL_GPL(c_can_power_up);