Skip to content

Commit 348f968

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from netfilter, wireless and bluetooth. Kalle Valo steps down after serving as the WiFi driver maintainer for over a decade. Current release - fix to a fix: - vsock: orphan socket after transport release, avoid null-deref - Bluetooth: L2CAP: fix corrupted list in hci_chan_del Current release - regressions: - eth: - stmmac: correct Rx buffer layout when SPH is enabled - iavf: fix a locking bug in an error path - rxrpc: fix alteration of headers whilst zerocopy pending - s390/qeth: move netif_napi_add_tx() and napi_enable() from under BH - Revert "netfilter: flowtable: teardown flow if cached mtu is stale" Current release - new code bugs: - rxrpc: fix ipv6 path MTU discovery, only ipv4 worked - pse-pd: fix deadlock in current limit functions Previous releases - regressions: - rtnetlink: fix netns refleak with rtnl_setlink() - wifi: brcmfmac: use random seed flag for BCM4355 and BCM4364 firmware Previous releases - always broken: - add missing RCU protection of struct net throughout the stack - can: rockchip: bail out if skb cannot be allocated - eth: ti: am65-cpsw: base XDP support fixes Misc: - ethtool: tsconfig: update the format of hwtstamp flags, changes the uAPI but this uAPI was not in any release yet" * tag 'net-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (72 commits) net: pse-pd: Fix deadlock in current limit functions rxrpc: Fix ipv6 path MTU discovery Reapply "net: skb: introduce and use a single page frag cache" s390/qeth: move netif_napi_add_tx() and napi_enable() from under BH mlxsw: Add return value check for mlxsw_sp_port_get_stats_raw() ipv6: mcast: add RCU protection to mld_newpack() team: better TEAM_OPTION_TYPE_STRING validation Bluetooth: L2CAP: Fix corrupted list in hci_chan_del Bluetooth: btintel_pcie: Fix a potential race condition Bluetooth: L2CAP: Fix slab-use-after-free Read in l2cap_send_cmd net: ethernet: ti: am65_cpsw: fix tx_cleanup for XDP case net: ethernet: ti: am65-cpsw: fix RX & TX statistics for XDP_TX case net: ethernet: ti: am65-cpsw: fix memleak in certain XDP cases vsock/test: Add test for SO_LINGER null ptr deref vsock: Orphan socket after transport release MAINTAINERS: Add sctp headers to the general netdev entry Revert "netfilter: flowtable: teardown flow if cached mtu is stale" iavf: Fix a locking bug in an error path rxrpc: Fix alteration of headers whilst zerocopy pending net: phylink: make configuring clock-stop dependent on MAC support ...
2 parents 945ce41 + 488fb6e commit 348f968

Some content is hidden

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

75 files changed

+707
-456
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ Juha Yrjola <[email protected]>
376376
Julien Thierry <[email protected]> <[email protected]>
377377
Iskren Chernev <[email protected]> <[email protected]>
378378
Kalle Valo <[email protected]> <[email protected]>
379+
Kalle Valo <[email protected]> <[email protected]>
379380
Kalyan Thota <[email protected]> <[email protected]>
380381
Karthikeyan Periyasamy <[email protected]> <[email protected]>
381382
Kathiravan T <[email protected]> <[email protected]>

‎Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies ath10k wireless devices
88

99
maintainers:
10-
- Kalle Valo <[email protected]>
1110
- Jeff Johnson <[email protected]>
1211

1312
description:

‎Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices (PCIe)
99

1010
maintainers:
11-
- Kalle Valo <[email protected]>
1211
- Jeff Johnson <[email protected]>
1312

1413
description: |

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices
99

1010
maintainers:
11-
- Kalle Valo <[email protected]>
1211
- Jeff Johnson <[email protected]>
1312

1413
description: |

‎Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe) with WSI interface
99

1010
maintainers:
1111
- Jeff Johnson <[email protected]>
12-
- Kalle Valo <[email protected]>
1312

1413
description: |
1514
Qualcomm Technologies IEEE 802.11be PCIe devices with WSI interface.

‎Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe)
99

1010
maintainers:
1111
- Jeff Johnson <[email protected]>
12-
- Kalle Valo <[email protected]>
1312

1413
description:
1514
Qualcomm Technologies IEEE 802.11be PCIe devices.

‎Documentation/netlink/specs/ethtool.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,8 @@ attribute-sets:
15241524
nested-attributes: bitset
15251525
-
15261526
name: hwtstamp-flags
1527-
type: u32
1527+
type: nest
1528+
nested-attributes: bitset
15281529

15291530
operations:
15301531
enum-model: directional

‎Documentation/networking/iso15765-2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ to their default.
369369
370370
addr.can_family = AF_CAN;
371371
addr.can_ifindex = if_nametoindex("can0");
372-
addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373-
addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
372+
addr.can_addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373+
addr.can_addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
374374
375375
ret = bind(s, (struct sockaddr *)&addr, sizeof(addr));
376376
if (ret < 0)

‎MAINTAINERS

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3654,7 +3654,6 @@ F: Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
36543654
F: drivers/phy/qualcomm/phy-ath79-usb.c
36553655

36563656
ATHEROS ATH GENERIC UTILITIES
3657-
M: Kalle Valo <[email protected]>
36583657
M: Jeff Johnson <[email protected]>
36593658
L: [email protected]
36603659
S: Supported
@@ -16438,7 +16437,7 @@ X: drivers/net/can/
1643816437
X: drivers/net/wireless/
1643916438

1644016439
NETWORKING DRIVERS (WIRELESS)
16441-
M: Kalle Valo <[email protected]>
16440+
M: Johannes Berg <[email protected]>
1644216441
L: [email protected]
1644316442
S: Maintained
1644416443
W: https://wireless.wiki.kernel.org/
@@ -16509,6 +16508,7 @@ F: include/linux/netdev*
1650916508
F: include/linux/netlink.h
1651016509
F: include/linux/netpoll.h
1651116510
F: include/linux/rtnetlink.h
16511+
F: include/linux/sctp.h
1651216512
F: include/linux/seq_file_net.h
1651316513
F: include/linux/skbuff*
1651416514
F: include/net/
@@ -16525,6 +16525,7 @@ F: include/uapi/linux/netdev*
1652516525
F: include/uapi/linux/netlink.h
1652616526
F: include/uapi/linux/netlink_diag.h
1652716527
F: include/uapi/linux/rtnetlink.h
16528+
F: include/uapi/linux/sctp.h
1652816529
F: lib/net_utils.c
1652916530
F: lib/random32.c
1653016531
F: net/
@@ -19355,7 +19356,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
1935519356
F: drivers/media/tuners/qt1010*
1935619357

1935719358
QUALCOMM ATH12K WIRELESS DRIVER
19358-
M: Kalle Valo <[email protected]>
1935919359
M: Jeff Johnson <[email protected]>
1936019360
L: [email protected]
1936119361
S: Supported
@@ -19365,7 +19365,6 @@ F: drivers/net/wireless/ath/ath12k/
1936519365
N: ath12k
1936619366

1936719367
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
19368-
M: Kalle Valo <[email protected]>
1936919368
M: Jeff Johnson <[email protected]>
1937019369
L: [email protected]
1937119370
S: Supported
@@ -19375,7 +19374,6 @@ F: drivers/net/wireless/ath/ath10k/
1937519374
N: ath10k
1937619375

1937719376
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
19378-
M: Kalle Valo <[email protected]>
1937919377
M: Jeff Johnson <[email protected]>
1938019378
L: [email protected]
1938119379
S: Supported

‎drivers/bluetooth/btintel_pcie.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,10 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev,
13201320
if (opcode == 0xfc01)
13211321
btintel_pcie_inject_cmd_complete(hdev, opcode);
13221322
}
1323+
/* Firmware raises alive interrupt on HCI_OP_RESET */
1324+
if (opcode == HCI_OP_RESET)
1325+
data->gp0_received = false;
1326+
13231327
hdev->stat.cmd_tx++;
13241328
break;
13251329
case HCI_ACLDATA_PKT:
@@ -1357,7 +1361,6 @@ static int btintel_pcie_send_frame(struct hci_dev *hdev,
13571361
opcode, btintel_pcie_alivectxt_state2str(old_ctxt),
13581362
btintel_pcie_alivectxt_state2str(data->alive_intr_ctxt));
13591363
if (opcode == HCI_OP_RESET) {
1360-
data->gp0_received = false;
13611364
ret = wait_event_timeout(data->gp0_wait_q,
13621365
data->gp0_received,
13631366
msecs_to_jiffies(BTINTEL_DEFAULT_INTR_TIMEOUT_MS));

0 commit comments

Comments
 (0)