Skip to content

Commit 999f663

Browse files
torvaldstorvalds
committed
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 ...
2 parents 7bafbd4 + 0765c5f commit 999f663

File tree

123 files changed

+982
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+982
-446
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ allOf:
293293
patternProperties:
294294
"^mac@[0-1]$":
295295
type: object
296-
additionalProperties: false
296+
unevaluatedProperties: false
297297
allOf:
298298
- $ref: ethernet-controller.yaml#
299299
description:
@@ -305,14 +305,9 @@ patternProperties:
305305
reg:
306306
maxItems: 1
307307

308-
phy-handle: true
309-
310-
phy-mode: true
311-
312308
required:
313309
- reg
314310
- compatible
315-
- phy-handle
316311

317312
required:
318313
- compatible

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,18 @@ properties:
9191
$ref: /schemas/types.yaml#/definitions/phandle
9292

9393
tx_delay:
94-
description: Delay value for TXD timing. Range value is 0~0x7F, 0x30 as default.
94+
description: Delay value for TXD timing.
9595
$ref: /schemas/types.yaml#/definitions/uint32
96+
minimum: 0
97+
maximum: 0x7F
98+
default: 0x30
9699

97100
rx_delay:
98-
description: Delay value for RXD timing. Range value is 0~0x7F, 0x10 as default.
101+
description: Delay value for RXD timing.
99102
$ref: /schemas/types.yaml#/definitions/uint32
103+
minimum: 0
104+
maximum: 0x7F
105+
default: 0x10
100106

101107
phy-supply:
102108
description: PHY regulator

‎MAINTAINERS

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3262,9 +3262,8 @@ F: Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
32623262
F: drivers/input/touchscreen/atmel_mxt_ts.c
32633263

32643264
ATMEL WIRELESS DRIVER
3265-
M: Simon Kelley <[email protected]>
32663265
L: [email protected]
3267-
S: Maintained
3266+
S: Orphan
32683267
W: http://www.thekelleys.org.uk/atmel
32693268
W: http://atmelwlandriver.sourceforge.net/
32703269
F: drivers/net/wireless/atmel/atmel*
@@ -3394,7 +3393,7 @@ F: drivers/media/radio/radio-aztech*
33943393
B43 WIRELESS DRIVER
33953394
L: [email protected]
33963395
L: [email protected]
3397-
S: Odd Fixes
3396+
S: Orphan
33983397
W: https://wireless.wiki.kernel.org/en/users/Drivers/b43
33993398
F: drivers/net/wireless/broadcom/b43/
34003399

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

54645463
CW1200 WLAN driver
5465-
M: Solomon Peachy <[email protected]>
5466-
S: Maintained
5464+
S: Orphan
54675465
F: drivers/net/wireless/st/cw1200/
54685466

54695467
CX18 VIDEO4LINUX DRIVER
@@ -12592,18 +12590,14 @@ F: Documentation/devicetree/bindings/net/marvell,pp2.yaml
1259212590
F: drivers/net/ethernet/marvell/mvpp2/
1259312591

1259412592
MARVELL MWIFIEX WIRELESS DRIVER
12595-
M: Amitkumar Karwar <[email protected]>
12596-
M: Ganapathi Bhat <[email protected]>
12597-
M: Sharvari Harisangam <[email protected]>
12598-
M: Xinming Hu <[email protected]>
12593+
M: Brian Norris <[email protected]>
1259912594
L: [email protected]
12600-
S: Maintained
12595+
S: Odd Fixes
1260112596
F: drivers/net/wireless/marvell/mwifiex/
1260212597

1260312598
MARVELL MWL8K WIRELESS DRIVER
12604-
M: Lennert Buytenhek <[email protected]>
1260512599
L: [email protected]
12606-
S: Odd Fixes
12600+
S: Orphan
1260712601
F: drivers/net/wireless/marvell/mwl8k.c
1260812602

1260912603
MARVELL NAND CONTROLLER DRIVER
@@ -17449,13 +17443,15 @@ F: drivers/media/tuners/qt1010*
1744917443

1745017444
QUALCOMM ATH12K WIRELESS DRIVER
1745117445
M: Kalle Valo <[email protected]>
17446+
M: Jeff Johnson <[email protected]>
1745217447
L: [email protected]
1745317448
S: Supported
1745417449
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
1745517450
F: drivers/net/wireless/ath/ath12k/
1745617451

1745717452
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
1745817453
M: Kalle Valo <[email protected]>
17454+
M: Jeff Johnson <[email protected]>
1745917455
L: [email protected]
1746017456
S: Supported
1746117457
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
@@ -17465,6 +17461,7 @@ F: drivers/net/wireless/ath/ath10k/
1746517461

1746617462
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
1746717463
M: Kalle Valo <[email protected]>
17464+
M: Jeff Johnson <[email protected]>
1746817465
L: [email protected]
1746917466
S: Supported
1747017467
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
1798517982
F: drivers/net/wireless/realtek/rtlwifi/
1798617983

1798717984
REALTEK WIRELESS DRIVER (rtw88)
17988-
M: Yan-Hsuan Chuang <tony0620emma@gmail.com>
17985+
M: Ping-Ke Shih <pkshih@realtek.com>
1798917986
L: [email protected]
1799017987
S: Maintained
1799117988
F: drivers/net/wireless/realtek/rtw88/
@@ -20404,7 +20401,6 @@ F: drivers/pwm/pwm-stm32*
2040420401
F: include/linux/*/stm32-*tim*
2040520402

2040620403
STMMAC ETHERNET DRIVER
20407-
M: Giuseppe Cavallaro <[email protected]>
2040820404
M: Alexandre Torgue <[email protected]>
2040920405
M: Jose Abreu <[email protected]>
2041020406
L: [email protected]
@@ -21681,11 +21677,14 @@ S: Orphan
2168121677
F: drivers/net/ethernet/dec/tulip/
2168221678

2168321679
TUN/TAP driver
21684-
M: Maxim Krasnyansky <[email protected]>
21680+
M: Willem de Bruijn <[email protected]>
21681+
M: Jason Wang <[email protected]>
2168521682
S: Maintained
2168621683
W: http://vtun.sourceforge.net/tun
2168721684
F: Documentation/networking/tuntap.rst
2168821685
F: arch/um/os-Linux/drivers/
21686+
F: drivers/net/tap.c
21687+
F: drivers/net/tun.c
2168921688

2169021689
TURBOCHANNEL SUBSYSTEM
2169121690
M: "Maciej W. Rozycki" <[email protected]>
@@ -21908,9 +21907,8 @@ S: Maintained
2190821907
F: drivers/usb/misc/apple-mfi-fastcharge.c
2190921908

2191021909
USB AR5523 WIRELESS DRIVER
21911-
M: Pontus Fuchs <[email protected]>
2191221910
L: [email protected]
21913-
S: Maintained
21911+
S: Orphan
2191421912
F: drivers/net/wireless/ath/ar5523/
2191521913

2191621914
USB ATTACHED SCSI
@@ -22187,9 +22185,8 @@ F: drivers/usb/gadget/legacy/webcam.c
2218722185
F: include/uapi/linux/usb/g_uvc.h
2218822186

2218922187
USB WIRELESS RNDIS DRIVER (rndis_wlan)
22190-
M: Jussi Kivilinna <[email protected]>
2219122188
L: [email protected]
22192-
S: Maintained
22189+
S: Orphan
2219322190
F: drivers/net/wireless/legacy/rndis_wlan.c
2219422191

2219522192
USB XHCI DRIVER
@@ -22964,7 +22961,7 @@ F: drivers/input/misc/wistron_btns.c
2296422961

2296522962
WL3501 WIRELESS PCMCIA CARD DRIVER
2296622963
L: [email protected]
22967-
S: Odd fixes
22964+
S: Orphan
2296822965
F: drivers/net/wireless/legacy/wl3501*
2296922966

2297022967
WMI BINARY MOF DRIVER
@@ -23535,11 +23532,8 @@ S: Maintained
2353523532
F: mm/zbud.c
2353623533

2353723534
ZD1211RW WIRELESS DRIVER
23538-
M: Ulrich Kunitz <[email protected]>
2353923535
L: [email protected]
23540-
L: [email protected] (subscribers-only)
23541-
S: Maintained
23542-
W: http://zd1211.ath.cx/wiki/DriverRewrite
23536+
S: Orphan
2354323537
F: drivers/net/wireless/zydas/zd1211rw/
2354423538

2354523539
ZD1301 MEDIA DRIVER

‎drivers/isdn/hardware/mISDN/hfcpci.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ hfcpci_fill_fifo(struct bchannel *bch)
839839
*z1t = cpu_to_le16(new_z1); /* now send data */
840840
if (bch->tx_idx < bch->tx_skb->len)
841841
return;
842-
dev_kfree_skb(bch->tx_skb);
842+
dev_kfree_skb_any(bch->tx_skb);
843843
if (get_next_bframe(bch))
844844
goto next_t_frame;
845845
return;
@@ -895,7 +895,7 @@ hfcpci_fill_fifo(struct bchannel *bch)
895895
}
896896
bz->za[new_f1].z1 = cpu_to_le16(new_z1); /* for next buffer */
897897
bz->f1 = new_f1; /* next frame */
898-
dev_kfree_skb(bch->tx_skb);
898+
dev_kfree_skb_any(bch->tx_skb);
899899
get_next_bframe(bch);
900900
}
901901

@@ -1119,7 +1119,7 @@ tx_birq(struct bchannel *bch)
11191119
if (bch->tx_skb && bch->tx_idx < bch->tx_skb->len)
11201120
hfcpci_fill_fifo(bch);
11211121
else {
1122-
dev_kfree_skb(bch->tx_skb);
1122+
dev_kfree_skb_any(bch->tx_skb);
11231123
if (get_next_bframe(bch))
11241124
hfcpci_fill_fifo(bch);
11251125
}
@@ -2277,7 +2277,7 @@ _hfcpci_softirq(struct device *dev, void *unused)
22772277
return 0;
22782278

22792279
if (hc->hw.int_m2 & HFCPCI_IRQ_ENABLE) {
2280-
spin_lock(&hc->lock);
2280+
spin_lock_irq(&hc->lock);
22812281
bch = Sel_BCS(hc, hc->hw.bswapped ? 2 : 1);
22822282
if (bch && bch->state == ISDN_P_B_RAW) { /* B1 rx&tx */
22832283
main_rec_hfcpci(bch);
@@ -2288,7 +2288,7 @@ _hfcpci_softirq(struct device *dev, void *unused)
22882288
main_rec_hfcpci(bch);
22892289
tx_birq(bch);
22902290
}
2291-
spin_unlock(&hc->lock);
2291+
spin_unlock_irq(&hc->lock);
22922292
}
22932293
return 0;
22942294
}

‎drivers/net/dsa/bcm_sf2.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,15 +1436,19 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
14361436
if (IS_ERR(priv->clk))
14371437
return PTR_ERR(priv->clk);
14381438

1439-
clk_prepare_enable(priv->clk);
1439+
ret = clk_prepare_enable(priv->clk);
1440+
if (ret)
1441+
return ret;
14401442

14411443
priv->clk_mdiv = devm_clk_get_optional(&pdev->dev, "sw_switch_mdiv");
14421444
if (IS_ERR(priv->clk_mdiv)) {
14431445
ret = PTR_ERR(priv->clk_mdiv);
14441446
goto out_clk;
14451447
}
14461448

1447-
clk_prepare_enable(priv->clk_mdiv);
1449+
ret = clk_prepare_enable(priv->clk_mdiv);
1450+
if (ret)
1451+
goto out_clk;
14481452

14491453
ret = bcm_sf2_sw_rst(priv);
14501454
if (ret) {

‎drivers/net/dsa/microchip/ksz_common.c

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {
635635
regmap_reg_range(0x1030, 0x1030),
636636
regmap_reg_range(0x1100, 0x1115),
637637
regmap_reg_range(0x111a, 0x111f),
638-
regmap_reg_range(0x1122, 0x1127),
639-
regmap_reg_range(0x112a, 0x112b),
640-
regmap_reg_range(0x1136, 0x1139),
641-
regmap_reg_range(0x113e, 0x113f),
638+
regmap_reg_range(0x1120, 0x112b),
639+
regmap_reg_range(0x1134, 0x113b),
640+
regmap_reg_range(0x113c, 0x113f),
642641
regmap_reg_range(0x1400, 0x1401),
643642
regmap_reg_range(0x1403, 0x1403),
644643
regmap_reg_range(0x1410, 0x1417),
@@ -669,10 +668,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {
669668
regmap_reg_range(0x2030, 0x2030),
670669
regmap_reg_range(0x2100, 0x2115),
671670
regmap_reg_range(0x211a, 0x211f),
672-
regmap_reg_range(0x2122, 0x2127),
673-
regmap_reg_range(0x212a, 0x212b),
674-
regmap_reg_range(0x2136, 0x2139),
675-
regmap_reg_range(0x213e, 0x213f),
671+
regmap_reg_range(0x2120, 0x212b),
672+
regmap_reg_range(0x2134, 0x213b),
673+
regmap_reg_range(0x213c, 0x213f),
676674
regmap_reg_range(0x2400, 0x2401),
677675
regmap_reg_range(0x2403, 0x2403),
678676
regmap_reg_range(0x2410, 0x2417),
@@ -703,10 +701,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {
703701
regmap_reg_range(0x3030, 0x3030),
704702
regmap_reg_range(0x3100, 0x3115),
705703
regmap_reg_range(0x311a, 0x311f),
706-
regmap_reg_range(0x3122, 0x3127),
707-
regmap_reg_range(0x312a, 0x312b),
708-
regmap_reg_range(0x3136, 0x3139),
709-
regmap_reg_range(0x313e, 0x313f),
704+
regmap_reg_range(0x3120, 0x312b),
705+
regmap_reg_range(0x3134, 0x313b),
706+
regmap_reg_range(0x313c, 0x313f),
710707
regmap_reg_range(0x3400, 0x3401),
711708
regmap_reg_range(0x3403, 0x3403),
712709
regmap_reg_range(0x3410, 0x3417),
@@ -737,10 +734,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {
737734
regmap_reg_range(0x4030, 0x4030),
738735
regmap_reg_range(0x4100, 0x4115),
739736
regmap_reg_range(0x411a, 0x411f),
740-
regmap_reg_range(0x4122, 0x4127),
741-
regmap_reg_range(0x412a, 0x412b),
742-
regmap_reg_range(0x4136, 0x4139),
743-
regmap_reg_range(0x413e, 0x413f),
737+
regmap_reg_range(0x4120, 0x412b),
738+
regmap_reg_range(0x4134, 0x413b),
739+
regmap_reg_range(0x413c, 0x413f),
744740
regmap_reg_range(0x4400, 0x4401),
745741
regmap_reg_range(0x4403, 0x4403),
746742
regmap_reg_range(0x4410, 0x4417),
@@ -771,10 +767,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {
771767
regmap_reg_range(0x5030, 0x5030),
772768
regmap_reg_range(0x5100, 0x5115),
773769
regmap_reg_range(0x511a, 0x511f),
774-
regmap_reg_range(0x5122, 0x5127),
775-
regmap_reg_range(0x512a, 0x512b),
776-
regmap_reg_range(0x5136, 0x5139),
777-
regmap_reg_range(0x513e, 0x513f),
770+
regmap_reg_range(0x5120, 0x512b),
771+
regmap_reg_range(0x5134, 0x513b),
772+
regmap_reg_range(0x513c, 0x513f),
778773
regmap_reg_range(0x5400, 0x5401),
779774
regmap_reg_range(0x5403, 0x5403),
780775
regmap_reg_range(0x5410, 0x5417),

0 commit comments

Comments
 (0)