Commit 9bd572ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Still no major regressions, the release continues to be calm. An
  uptick of fixes this time around due to trivial data race fixes and
  patches flowing down from subtrees.

  There has been a few driver fixes (particularly a few fixes for false
  positives due to 66e4c8d9 which went into -next in May!) that make
  me worry the wide testing is not exactly fully through.

  So "calm" but not "let's just cut the final ASAP" vibes over here.

  Current release - regressions:

   - wifi: rtw88: fix write to const table of channel parameters

  Current release - new code bugs:

   - mac80211: add gfp_t arg to ieeee80211_obss_color_collision_notify

   - mlx5:
      - TC, allow offload from uplink to other PF's VF
      - Lag, decouple FDB selection and shared FDB
      - Lag, correct get the port select mode str

   - bnxt_en: fix and simplify XDP transmit path

   - r8152: fix accessing unset transport header

  Previous releases - regressions:

   - conntrack: fix crash due to confirmed bit load reordering (after
     atomic -> refcount conversion)

   - stmmac: dwc-qos: disable split header for Tegra194

  Previous releases - always broken:

   - mlx5e: ring the TX doorbell on DMA errors

   - bpf: make sure mac_header was set before using it

   - mac80211: do not wake queues on a vif that is being stopped

   - mac80211: fix queue selection for mesh/OCB interfaces

   - ip: fix dflt addr selection for connected nexthop

   - seg6: fix skb checksums for SRH encapsulation/insertion

   - xdp: fix spurious packet loss in generic XDP TX path

   - bunch of sysctl data race fixes

   - nf_log: incorrect offset to network header

  Misc:

   - bpf: add flags arg to bpf_dynptr_read and bpf_dynptr_write APIs"

* tag 'net-5.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (87 commits)
  nfp: flower: configure tunnel neighbour on cmsg rx
  net/tls: Check for errors in tls_device_init
  MAINTAINERS: Add an additional maintainer to the AMD XGBE driver
  xen/netback: avoid entering xenvif_rx_next_skb() with an empty rx queue
  selftests/net: test nexthop without gw
  ip: fix dflt addr selection for connected nexthop
  net: atlantic: remove aq_nic_deinit() when resume
  net: atlantic: remove deep parameter on suspend/resume functions
  sfc: fix kernel panic when creating VF
  seg6: bpf: fix skb checksum in bpf_push_seg6_encap()
  seg6: fix skb checksum in SRv6 End.B6 and End.B6.Encaps behaviors
  seg6: fix skb checksum evaluation in SRH encapsulation/insertion
  sfc: fix use after free when disabling sriov
  net: sunhme: output link status with a single print.
  r8152: fix accessing unset transport header
  net: stmmac: fix leaks in probe
  net: ftgmac100: Hold reference returned by of_get_child_by_name()
  nexthop: Fix data-races around nexthop_compat_mode.
  ipv4: Fix data-races around sysctl_ip_dynaddr.
  tcp: Fix a data-race around sysctl_tcp_ecn_fallback.
  ...
parents f41d5df5 656bd03a

Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm Atheros ath9k wireless devices Generic Binding



maintainers:

  - Kalle Valo <kvalo@codeaurora.org>

  - Toke Høiland-Jørgensen <toke@toke.dk>



description: |

  This node provides properties for configuring the ath9k wireless device.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm Technologies ath11k wireless devices Generic Binding



maintainers:

  - Kalle Valo <kvalo@codeaurora.org>

  - Kalle Valo <kvalo@kernel.org>



description: |

  These are dt entries for Qualcomm Technologies, Inc. IEEE 802.11ax

Documentation/networking/ip-sysctl.rst

+2 −2
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ cipso_cache_enable - BOOLEAN 
cipso_cache_bucket_size - INTEGER

	The CIPSO label cache consists of a fixed size hash table with each

	hash bucket containing a number of cache entries.  This variable limits

	the number of entries in each hash bucket; the larger the value the

	the number of entries in each hash bucket; the larger the value is, the

	more CIPSO label mappings that can be cached.  When the number of

	entries in a given hash bucket reaches this limit adding new entries

	causes the oldest entry in the bucket to be removed to make room.
@@ -1179,7 +1179,7 @@ ip_autobind_reuse - BOOLEAN 
	option should only be set by experts.

	Default: 0



ip_dynaddr - BOOLEAN

ip_dynaddr - INTEGER

	If set non-zero, enables support for dynamic addresses.

	If set to a non-zero value larger than 1, a kernel log

	message will be printed when dynamic address rewriting

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,7 @@ F: arch/arm64/boot/dts/amd/ 








AMD XGBE DRIVER









M:	Tom Lendacky <thomas.lendacky@amd.com>









M:	"Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
































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



+8
−15






























Original line number
Diff line number
Diff line







@@ -379,7 +379,7 @@ static void aq_pci_shutdown(struct pci_dev *pdev)







	}









}



















static int aq_suspend_common(struct device *dev, bool deep)









static int aq_suspend_common(struct device *dev)









{









	struct aq_nic_s *nic = pci_get_drvdata(to_pci_dev(dev));


















@@ -392,17 +392,15 @@ static int aq_suspend_common(struct device *dev, bool deep)







	if (netif_running(nic->ndev))









		aq_nic_stop(nic);



















	if (deep) {









	aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);









	aq_nic_set_power(nic);









	}



















	rtnl_unlock();



















	return 0;









}



















static int atl_resume_common(struct device *dev, bool deep)









static int atl_resume_common(struct device *dev)









{









	struct pci_dev *pdev = to_pci_dev(dev);









	struct aq_nic_s *nic;








@@ -415,11 +413,6 @@ static int atl_resume_common(struct device *dev, bool deep)







	pci_set_power_state(pdev, PCI_D0);









	pci_restore_state(pdev);



















	if (deep) {









		/* Reinitialize Nic/Vecs objects */









		aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);









	}



















	if (netif_running(nic->ndev)) {









		ret = aq_nic_init(nic);









		if (ret)








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

















static int aq_pm_freeze(struct device *dev)









{









	return aq_suspend_common(dev, true);









	return aq_suspend_common(dev);









}



















static int aq_pm_suspend_poweroff(struct device *dev)









{









	return aq_suspend_common(dev, true);









	return aq_suspend_common(dev);









}



















static int aq_pm_thaw(struct device *dev)









{









	return atl_resume_common(dev, true);









	return atl_resume_common(dev);









}



















static int aq_pm_resume_restore(struct device *dev)









{









	return atl_resume_common(dev, true);









	return atl_resume_common(dev);









}



















static const struct dev_pm_ops aq_pm_ops = {