Commit 999f6631 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Nothing scary here. Feels like the first wave of regressions from v6.5
  is addressed - one outstanding fix still to come in TLS for the
  sendpage rework.

  Current release - regressions:

   - udp: fix __ip_append_data()'s handling of MSG_SPLICE_PAGES

   - dsa: fix older DSA drivers using phylink

  Previous releases - regressions:

   - gro: fix misuse of CB in udp socket lookup

   - mlx5: unregister devlink params in case interface is down

   - Revert "wifi: ath11k: Enable threaded NAPI"

  Previous releases - always broken:

   - sched: cls_u32: fix match key mis-addressing

   - sched: bind logic fixes for cls_fw, cls_u32 and cls_route

   - add bound checks to a number of places which hand-parse netlink

   - bpf: disable preemption in perf_event_output helpers code

   - qed: fix scheduling in a tasklet while getting stats

   - avoid using APIs which are not hardirq-safe in couple of drivers,
     when we may be in a hard IRQ (netconsole)

   - wifi: cfg80211: fix return value in scan logic, avoid page
     allocator warning

   - wifi: mt76: mt7615: do not advertise 5 GHz on first PHY of MT7615D
     (DBDC)

  Misc:

   - drop handful of inactive maintainers, put some new in place"

* tag 'net-6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (98 commits)
  MAINTAINERS: update TUN/TAP maintainers
  test/vsock: remove vsock_perf executable on `make clean`
  tcp_metrics: fix data-race in tcpm_suck_dst() vs fastopen
  tcp_metrics: annotate data-races around tm->tcpm_net
  tcp_metrics: annotate data-races around tm->tcpm_vals[]
  tcp_metrics: annotate data-races around tm->tcpm_lock
  tcp_metrics: annotate data-races around tm->tcpm_stamp
  tcp_metrics: fix addr_same() helper
  prestera: fix fallback to previous version on same major version
  udp: Fix __ip_append_data()'s handling of MSG_SPLICE_PAGES
  net/mlx5e: Set proper IPsec source port in L4 selector
  net/mlx5: fs_core: Skip the FTs in the same FS_TYPE_PRIO_CHAINS fs_prio
  net/mlx5: fs_core: Make find_closest_ft more generic
  wifi: brcmfmac: Fix field-spanning write in brcmf_scan_params_v2_to_v1()
  vxlan: Fix nexthop hash size
  ip6mr: Fix skb_under_panic in ip6mr_cache_report()
  s390/qeth: Don't call dev_close/dev_open (DOWN/UP)
  net: tap_open(): set sk_uid from current_fsuid()
  net: tun_chr_open(): set sk_uid from current_fsuid()
  net: dcb: choose correct policy to parse DCB_ATTR_BCN
  ...
parents 7bafbd40 0765c5f2

Documentation/devicetree/bindings/net/mediatek,net.yaml

+1 −6
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ allOf: 
patternProperties:

  "^mac@[0-1]$":

    type: object

    additionalProperties: false

    unevaluatedProperties: false

    allOf:

      - $ref: ethernet-controller.yaml#

    description:
@@ -305,14 +305,9 @@ patternProperties: 
      reg:

        maxItems: 1



      phy-handle: true



      phy-mode: true



    required:

      - reg

      - compatible

      - phy-handle



required:

  - compatible

Documentation/devicetree/bindings/net/rockchip-dwmac.yaml

+8 −2
Original line number Diff line number Diff line
@@ -91,12 +91,18 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle



  tx_delay:

    description: Delay value for TXD timing. Range value is 0~0x7F, 0x30 as default.

    description: Delay value for TXD timing.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 0x7F

    default: 0x30



  rx_delay:

    description: Delay value for RXD timing. Range value is 0~0x7F, 0x10 as default.

    description: Delay value for RXD timing.

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 0x7F

    default: 0x10



  phy-supply:

    description: PHY regulator

MAINTAINERS

+18 −24
Original line number Diff line number Diff line
@@ -3262,9 +3262,8 @@ F: Documentation/devicetree/bindings/input/atmel,maxtouch.yaml 
F:	drivers/input/touchscreen/atmel_mxt_ts.c









ATMEL WIRELESS DRIVER









M:	Simon Kelley <simon@thekelleys.org.uk>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









W:	http://www.thekelleys.org.uk/atmel









W:	http://atmelwlandriver.sourceforge.net/









F:	drivers/net/wireless/atmel/atmel*








@@ -3394,7 +3393,7 @@ F:	drivers/media/radio/radio-aztech*







B43 WIRELESS DRIVER









L:	linux-wireless@vger.kernel.org









L:	b43-dev@lists.infradead.org









S:	Odd Fixes









S:	Orphan









W:	https://wireless.wiki.kernel.org/en/users/Drivers/b43









F:	drivers/net/wireless/broadcom/b43/
















@@ -5462,8 +5461,7 @@ F:	Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml







F:	drivers/net/can/ctucanfd/

















CW1200 WLAN driver









M:	Solomon Peachy <pizza@shaftnet.org>









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/st/cw1200/

















CX18 VIDEO4LINUX DRIVER








@@ -12592,18 +12590,14 @@ F:	Documentation/devicetree/bindings/net/marvell,pp2.yaml







F:	drivers/net/ethernet/marvell/mvpp2/

















MARVELL MWIFIEX WIRELESS DRIVER









M:	Amitkumar Karwar <amitkarwar@gmail.com>









M:	Ganapathi Bhat <ganapathi017@gmail.com>









M:	Sharvari Harisangam <sharvari.harisangam@nxp.com>









M:	Xinming Hu <huxinming820@gmail.com>









M:	Brian Norris <briannorris@chromium.org>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/net/wireless/marvell/mwifiex/

















MARVELL MWL8K WIRELESS DRIVER









M:	Lennert Buytenhek <buytenh@wantstofly.org>









L:	linux-wireless@vger.kernel.org









S:	Odd Fixes









S:	Orphan









F:	drivers/net/wireless/marvell/mwl8k.c

















MARVELL NAND CONTROLLER DRIVER








@@ -17449,6 +17443,7 @@ F:	drivers/media/tuners/qt1010*















QUALCOMM ATH12K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath12k@lists.infradead.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git








@@ -17456,6 +17451,7 @@ F:	drivers/net/wireless/ath/ath12k/















QUALCOMM ATHEROS ATH10K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath10k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath10k








@@ -17465,6 +17461,7 @@ F:	drivers/net/wireless/ath/ath10k/















QUALCOMM ATHEROS ATH11K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath11k@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k








@@ -17985,7 +17982,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g







F:	drivers/net/wireless/realtek/rtlwifi/

















REALTEK WIRELESS DRIVER (rtw88)









M:	Yan-Hsuan Chuang <tony0620emma@gmail.com>









M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









F:	drivers/net/wireless/realtek/rtw88/








@@ -20404,7 +20401,6 @@ F:	drivers/pwm/pwm-stm32*







F:	include/linux/*/stm32-*tim*

















STMMAC ETHERNET DRIVER









M:	Giuseppe Cavallaro <peppe.cavallaro@st.com>









M:	Alexandre Torgue <alexandre.torgue@foss.st.com>









M:	Jose Abreu <joabreu@synopsys.com>









L:	netdev@vger.kernel.org








@@ -21681,11 +21677,14 @@ S:	Orphan







F:	drivers/net/ethernet/dec/tulip/

















TUN/TAP driver









M:	Maxim Krasnyansky <maxk@qti.qualcomm.com>









M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>









M:	Jason Wang <jasowang@redhat.com>









S:	Maintained









W:	http://vtun.sourceforge.net/tun









F:	Documentation/networking/tuntap.rst









F:	arch/um/os-Linux/drivers/









F:	drivers/net/tap.c









F:	drivers/net/tun.c

















TURBOCHANNEL SUBSYSTEM









M:	"Maciej W. Rozycki" <macro@orcam.me.uk>








@@ -21908,9 +21907,8 @@ S:	Maintained







F:	drivers/usb/misc/apple-mfi-fastcharge.c

















USB AR5523 WIRELESS DRIVER









M:	Pontus Fuchs <pontus.fuchs@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/ath/ar5523/

















USB ATTACHED SCSI








@@ -22187,9 +22185,8 @@ F:	drivers/usb/gadget/legacy/webcam.c







F:	include/uapi/linux/usb/g_uvc.h

















USB WIRELESS RNDIS DRIVER (rndis_wlan)









M:	Jussi Kivilinna <jussi.kivilinna@iki.fi>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/legacy/rndis_wlan.c

















USB XHCI DRIVER








@@ -22964,7 +22961,7 @@ F:	drivers/input/misc/wistron_btns.c















WL3501 WIRELESS PCMCIA CARD DRIVER









L:	linux-wireless@vger.kernel.org









S:	Odd fixes









S:	Orphan









F:	drivers/net/wireless/legacy/wl3501*

















WMI BINARY MOF DRIVER








@@ -23535,11 +23532,8 @@ S:	Maintained







F:	mm/zbud.c

















ZD1211RW WIRELESS DRIVER









M:	Ulrich Kunitz <kune@deine-taler.de>









L:	linux-wireless@vger.kernel.org









L:	zd1211-devs@lists.sourceforge.net (subscribers-only)









S:	Maintained









W:	http://zd1211.ath.cx/wiki/DriverRewrite









S:	Orphan









F:	drivers/net/wireless/zydas/zd1211rw/

















ZD1301 MEDIA DRIVER

























drivers/isdn/hardware/mISDN/hfcpci.c



+5
−5






























Original line number
Diff line number
Diff line







@@ -839,7 +839,7 @@ hfcpci_fill_fifo(struct bchannel *bch)







		*z1t = cpu_to_le16(new_z1);	/* now send data */









		if (bch->tx_idx < bch->tx_skb->len)









			return;









		dev_kfree_skb(bch->tx_skb);









		dev_kfree_skb_any(bch->tx_skb);









		if (get_next_bframe(bch))









			goto next_t_frame;









		return;








@@ -895,7 +895,7 @@ hfcpci_fill_fifo(struct bchannel *bch)







	}









	bz->za[new_f1].z1 = cpu_to_le16(new_z1);	/* for next buffer */









	bz->f1 = new_f1;	/* next frame */









	dev_kfree_skb(bch->tx_skb);









	dev_kfree_skb_any(bch->tx_skb);









	get_next_bframe(bch);









}


















@@ -1119,7 +1119,7 @@ tx_birq(struct bchannel *bch)







	if (bch->tx_skb && bch->tx_idx < bch->tx_skb->len)









		hfcpci_fill_fifo(bch);









	else {









		dev_kfree_skb(bch->tx_skb);









		dev_kfree_skb_any(bch->tx_skb);









		if (get_next_bframe(bch))









			hfcpci_fill_fifo(bch);









	}








@@ -2277,7 +2277,7 @@ _hfcpci_softirq(struct device *dev, void *unused)







		return 0;



















	if (hc->hw.int_m2 & HFCPCI_IRQ_ENABLE) {









		spin_lock(&hc->lock);









		spin_lock_irq(&hc->lock);









		bch = Sel_BCS(hc, hc->hw.bswapped ? 2 : 1);









		if (bch && bch->state == ISDN_P_B_RAW) { /* B1 rx&tx */









			main_rec_hfcpci(bch);








@@ -2288,7 +2288,7 @@ _hfcpci_softirq(struct device *dev, void *unused)







			main_rec_hfcpci(bch);









			tx_birq(bch);









		}









		spin_unlock(&hc->lock);









		spin_unlock_irq(&hc->lock);









	}









	return 0;









}
































drivers/net/dsa/bcm_sf2.c



+6
−2






























Original line number
Diff line number
Diff line







@@ -1436,7 +1436,9 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)







	if (IS_ERR(priv->clk))









		return PTR_ERR(priv->clk);



















	clk_prepare_enable(priv->clk);









	ret = clk_prepare_enable(priv->clk);









	if (ret)









		return ret;



















	priv->clk_mdiv = devm_clk_get_optional(&pdev->dev, "sw_switch_mdiv");









	if (IS_ERR(priv->clk_mdiv)) {








@@ -1444,7 +1446,9 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)







		goto out_clk;









	}



















	clk_prepare_enable(priv->clk_mdiv);









	ret = clk_prepare_enable(priv->clk_mdiv);









	if (ret)









		goto out_clk;



















	ret = bcm_sf2_sw_rst(priv);









	if (ret) {