Skip to content

Commit e576349

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni: "Including fixes from wireless, Bluetooth and netfilter. Current release - regressions: - tcp: fix too slow tcp_rcvbuf_grow() action - bluetooth: fix corruption in h4_recv_buf() after cleanup Previous releases - regressions: - mptcp: restore window probe - bluetooth: - fix connection cleanup with BIG with 2 or more BIS - fix crash in set_mesh_sync and set_mesh_complete - batman-adv: release references to inactive interfaces - nic: - ice: fix usage of logical PF id - sfc: fix potential memory leak in efx_mae_process_mport() Previous releases - always broken: - devmem: refresh devmem TX dst in case of route invalidation - netfilter: add seqadj extension for natted connections - wifi: - iwlwifi: fix potential use after free in iwl_mld_remove_link() - brcmfmac: fix crash while sending action frames in standalone AP Mode - eth: - mlx5e: cancel tls RX async resync request in error flows - ixgbe: fix memory leak and use-after-free in ixgbe_recovery_probe() - hibmcge: fix rx buf avl irq is not re-enabled in irq_handle issue - cxgb4: fix potential use-after-free in ipsec callback - nfp: fix memory leak in nfp_net_alloc()" * tag 'net-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (75 commits) net: sctp: fix KMSAN uninit-value in sctp_inq_pop net: devmem: refresh devmem TX dst in case of route invalidation net: stmmac: est: Fix GCL bounds checks net: stmmac: Consider Tx VLAN offload tag length for maxSDU net: stmmac: vlan: Disable 802.1AD tag insertion offload net/mlx5e: kTLS, Cancel RX async resync request in error flows net: tls: Cancel RX async resync request on rcd_delta overflow net: tls: Change async resync helpers argument net: phy: dp83869: fix STRAP_OPMODE bitmask selftests: net: use BASH for bareudp testing net: mctp: Fix tx queue stall net/mlx5: Don't zero user_count when destroying FDB tables net: usb: asix_devices: Check return value of usbnet_get_endpoints mptcp: zero window probe mib mptcp: restore window probe mptcp: fix MSG_PEEK stream corruption mptcp: drop bogus optimization in __mptcp_check_push() netconsole: Fix race condition in between reader and writer of userdata Documentation: netconsole: Remove obsolete contact people nfp: xsk: fix memory leak in nfp_net_alloc() ...
2 parents e53642b + 51e5ad5 commit e576349

File tree

96 files changed

+597
-285
lines changed

Some content is hidden

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

96 files changed

+597
-285
lines changed

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a
20362036
S: 602 00 Brno
20372037
S: Czech Republic
20382038

2039+
N: Karsten Keil
2040+
E: isdn@linux-pingi.de
2041+
D: ISDN subsystem maintainer
2042+
20392043
N: Jakob Kemi
20402044
E: jakob.kemi@telia.com
20412045
D: V4L W9966 Webcam driver

‎Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ allOf:
180180
then:
181181
properties:
182182
reg:
183-
minItems: 2
183+
maxItems: 2
184184
reg-names:
185-
minItems: 2
185+
maxItems: 2
186186
else:
187187
properties:
188188
reg:

‎Documentation/netlink/specs/dpll.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ operations:
605605
reply: &pin-attrs
606606
attributes:
607607
- id
608+
- module-name
609+
- clock-id
608610
- board-label
609611
- panel-label
610612
- package-label

‎Documentation/networking/netconsole.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ Userdata append support by Matthew Wood <thepacketgeek@gmail.com>, Jan 22 2024
1919

2020
Sysdata append support by Breno Leitao <leitao@debian.org>, Jan 15 2025
2121

22-
Please send bug reports to Matt Mackall <mpm@selenic.com>
23-
Satyam Sharma <satyam.sharma@gmail.com>, and Cong Wang <xiyou.wangcong@gmail.com>
24-
2522
Introduction:
2623
=============
2724

‎MAINTAINERS‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13260,10 +13260,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git mast
1326013260
F: drivers/infiniband/ulp/isert
1326113261

1326213262
ISDN/CMTP OVER BLUETOOTH
13263-
M: Karsten Keil <isdn@linux-pingi.de>
13264-
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
1326513263
L: netdev@vger.kernel.org
13266-
S: Odd Fixes
13264+
S: Orphan
1326713265
W: http://www.isdn4linux.de
1326813266
F: Documentation/isdn/
1326913267
F: drivers/isdn/capi/
@@ -13272,10 +13270,8 @@ F: include/uapi/linux/isdn/
1327213270
F: net/bluetooth/cmtp/
1327313271

1327413272
ISDN/mISDN SUBSYSTEM
13275-
M: Karsten Keil <isdn@linux-pingi.de>
13276-
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
1327713273
L: netdev@vger.kernel.org
13278-
S: Maintained
13274+
S: Orphan
1327913275
W: http://www.isdn4linux.de
1328013276
F: drivers/isdn/Kconfig
1328113277
F: drivers/isdn/Makefile
@@ -21332,6 +21328,7 @@ F: drivers/media/platform/qcom/venus/
2133221328
QUALCOMM WCN36XX WIRELESS DRIVER
2133321329
M: Loic Poulain <loic.poulain@oss.qualcomm.com>
2133421330
L: wcn36xx@lists.infradead.org
21331+
L: linux-wireless@vger.kernel.org
2133521332
S: Supported
2133621333
W: https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
2133721334
F: drivers/net/wireless/ath/wcn36xx/

‎drivers/bcma/main.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,8 @@ static int bcma_register_devices(struct bcma_bus *bus)
294294
int err;
295295

296296
list_for_each_entry(core, &bus->cores, list) {
297+
struct device_node *np;
298+
297299
/* We support that core ourselves */
298300
switch (core->id.id) {
299301
case BCMA_CORE_4706_CHIPCOMMON:
@@ -311,6 +313,10 @@ static int bcma_register_devices(struct bcma_bus *bus)
311313
if (bcma_is_core_needed_early(core->id.id))
312314
continue;
313315

316+
np = core->dev.of_node;
317+
if (np && !of_device_is_available(np))
318+
continue;
319+
314320
/* Only first GMAC core on BCM4706 is connected and working */
315321
if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
316322
core->core_unit > 0)

‎drivers/bluetooth/bpa10x.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ struct bpa10x_data {
4141
struct usb_anchor rx_anchor;
4242

4343
struct sk_buff *rx_skb[2];
44+
struct hci_uart hu;
4445
};
4546

4647
static void bpa10x_tx_complete(struct urb *urb)
@@ -96,7 +97,7 @@ static void bpa10x_rx_complete(struct urb *urb)
9697
if (urb->status == 0) {
9798
bool idx = usb_pipebulk(urb->pipe);
9899

99-
data->rx_skb[idx] = h4_recv_buf(hdev, data->rx_skb[idx],
100+
data->rx_skb[idx] = h4_recv_buf(&data->hu, data->rx_skb[idx],
100101
urb->transfer_buffer,
101102
urb->actual_length,
102103
bpa10x_recv_pkts,
@@ -388,6 +389,7 @@ static int bpa10x_probe(struct usb_interface *intf,
388389
hci_set_drvdata(hdev, data);
389390

390391
data->hdev = hdev;
392+
data->hu.hdev = hdev;
391393

392394
SET_HCIDEV_DEV(hdev, &intf->dev);
393395

‎drivers/bluetooth/btintel_pcie.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,11 +1467,6 @@ static irqreturn_t btintel_pcie_irq_msix_handler(int irq, void *dev_id)
14671467
if (intr_hw & BTINTEL_PCIE_MSIX_HW_INT_CAUSES_GP1)
14681468
btintel_pcie_msix_gp1_handler(data);
14691469

1470-
/* This interrupt is triggered by the firmware after updating
1471-
* boot_stage register and image_response register
1472-
*/
1473-
if (intr_hw & BTINTEL_PCIE_MSIX_HW_INT_CAUSES_GP0)
1474-
btintel_pcie_msix_gp0_handler(data);
14751470

14761471
/* For TX */
14771472
if (intr_fh & BTINTEL_PCIE_MSIX_FH_INT_CAUSES_0) {
@@ -1487,6 +1482,12 @@ static irqreturn_t btintel_pcie_irq_msix_handler(int irq, void *dev_id)
14871482
btintel_pcie_msix_tx_handle(data);
14881483
}
14891484

1485+
/* This interrupt is triggered by the firmware after updating
1486+
* boot_stage register and image_response register
1487+
*/
1488+
if (intr_hw & BTINTEL_PCIE_MSIX_HW_INT_CAUSES_GP0)
1489+
btintel_pcie_msix_gp0_handler(data);
1490+
14901491
/*
14911492
* Before sending the interrupt the HW disables it to prevent a nested
14921493
* interrupt. This is done by writing 1 to the corresponding bit in

‎drivers/bluetooth/btmtksdio.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,12 @@ static void btmtksdio_reset(struct hci_dev *hdev)
12701270

12711271
sdio_claim_host(bdev->func);
12721272

1273+
/* set drv_pmctrl if BT is closed before doing reset */
1274+
if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state)) {
1275+
sdio_enable_func(bdev->func);
1276+
btmtksdio_drv_pmctrl(bdev);
1277+
}
1278+
12731279
sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);
12741280
skb_queue_purge(&bdev->txq);
12751281
cancel_work_sync(&bdev->txrx_work);
@@ -1285,6 +1291,12 @@ static void btmtksdio_reset(struct hci_dev *hdev)
12851291
goto err;
12861292
}
12871293

1294+
/* set fw_pmctrl back if BT is closed after doing reset */
1295+
if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state)) {
1296+
btmtksdio_fw_pmctrl(bdev);
1297+
sdio_disable_func(bdev->func);
1298+
}
1299+
12881300
clear_bit(BTMTKSDIO_PATCH_ENABLED, &bdev->tx_state);
12891301
err:
12901302
sdio_release_host(bdev->func);

‎drivers/bluetooth/btmtkuart.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ struct btmtkuart_dev {
7979
u16 stp_dlen;
8080

8181
const struct btmtkuart_data *data;
82+
struct hci_uart hu;
8283
};
8384

8485
#define btmtkuart_is_standalone(bdev) \
@@ -368,7 +369,7 @@ static void btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)
368369
sz_left -= adv;
369370
p_left += adv;
370371

371-
bdev->rx_skb = h4_recv_buf(bdev->hdev, bdev->rx_skb, p_h4,
372+
bdev->rx_skb = h4_recv_buf(&bdev->hu, bdev->rx_skb, p_h4,
372373
sz_h4, mtk_recv_pkts,
373374
ARRAY_SIZE(mtk_recv_pkts));
374375
if (IS_ERR(bdev->rx_skb)) {
@@ -858,6 +859,7 @@ static int btmtkuart_probe(struct serdev_device *serdev)
858859
}
859860

860861
bdev->hdev = hdev;
862+
bdev->hu.hdev = hdev;
861863

862864
hdev->bus = HCI_UART;
863865
hci_set_drvdata(hdev, bdev);

0 commit comments

Comments
 (0)