Skip to content

Commit b5c6891

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from Bluetooth, CAN and Netfilter. Current release - regressions: - two fixes for the netdev per-instance locking - batman-adv: fix double-hold of meshif when getting enabled Current release - new code bugs: - Bluetooth: increment TX timestamping tskey always for stream sockets - wifi: static analysis and build fixes for the new Intel sub-driver Previous releases - regressions: - net: fib_rules: fix iif / oif matching on L3 master (VRF) device - ipv6: add exception routes to GC list in rt6_insert_exception() - netfilter: conntrack: fix erroneous removal of offload bit - Bluetooth: - fix sending MGMT_EV_DEVICE_FOUND for invalid address - l2cap: process valid commands in too long frame - btnxpuart: Revert baudrate change in nxp_shutdown Previous releases - always broken: - ethtool: fix memory corruption during SFP FW flashing - eth: - hibmcge: fixes for link and MTU handling, pause frames etc - igc: fixes for PTM (PCIe timestamping) - dsa: b53: enable BPDU reception for management port Misc: - fixes for Netlink protocol schemas" * tag 'net-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (81 commits) net: ethernet: mtk_eth_soc: revise QDMA packet scheduler settings net: ethernet: mtk_eth_soc: correct the max weight of the queue limit for 100Mbps net: ethernet: mtk_eth_soc: reapply mdc divider on reset net: ti: icss-iep: Fix possible NULL pointer dereference for perout request net: ti: icssg-prueth: Fix possible NULL pointer dereference inside emac_xmit_xdp_frame() net: ti: icssg-prueth: Fix kernel warning while bringing down network interface netfilter: conntrack: fix erronous removal of offload bit net: don't try to ops lock uninitialized devs ptp: ocp: fix start time alignment in ptp_ocp_signal_set net: dsa: avoid refcount warnings when ds->ops->tag_8021q_vlan_del() fails net: dsa: free routing table on probe failure net: dsa: clean up FDB, MDB, VLAN entries on unbind net: dsa: mv88e6xxx: fix -ENOENT when deleting VLANs and MST is unsupported net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered net: txgbe: fix memory leak in txgbe_probe() error path net: bridge: switchdev: do not notify new brentries as changed net: b53: enable BPDU reception for management port netlink: specs: rt-neigh: prefix struct nfmsg members with ndm netlink: specs: rt-link: adjust mctp attribute naming netlink: specs: rtnetlink: attribute naming corrections ...
2 parents 85a9793 + 1b66124 commit b5c6891

File tree

72 files changed

+686
-278
lines changed

Some content is hidden

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

72 files changed

+686
-278
lines changed

‎Documentation/netlink/specs/ovs_vport.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ attribute-sets:
123123

124124
operations:
125125
name-prefix: ovs-vport-cmd-
126+
fixed-header: ovs-header
126127
list:
127128
-
128129
name: new
129130
doc: Create a new OVS vport
130131
attribute-set: vport
131-
fixed-header: ovs-header
132132
do:
133133
request:
134134
attributes:
@@ -141,7 +141,6 @@ operations:
141141
name: del
142142
doc: Delete existing OVS vport from a data path
143143
attribute-set: vport
144-
fixed-header: ovs-header
145144
do:
146145
request:
147146
attributes:
@@ -152,7 +151,6 @@ operations:
152151
name: get
153152
doc: Get / dump OVS vport configuration and state
154153
attribute-set: vport
155-
fixed-header: ovs-header
156154
do: &vport-get-op
157155
request:
158156
attributes:

‎Documentation/netlink/specs/rt_link.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,11 +1113,10 @@ attribute-sets:
11131113
-
11141114
name: prop-list
11151115
type: nest
1116-
nested-attributes: link-attrs
1116+
nested-attributes: prop-list-link-attrs
11171117
-
11181118
name: alt-ifname
11191119
type: string
1120-
multi-attr: true
11211120
-
11221121
name: perm-address
11231122
type: binary
@@ -1163,6 +1162,13 @@ attribute-sets:
11631162
-
11641163
name: netns-immutable
11651164
type: u8
1165+
-
1166+
name: prop-list-link-attrs
1167+
subset-of: link-attrs
1168+
attributes:
1169+
-
1170+
name: alt-ifname
1171+
multi-attr: true
11661172
-
11671173
name: af-spec-attrs
11681174
attributes:
@@ -1585,7 +1591,7 @@ attribute-sets:
15851591
name: nf-call-iptables
15861592
type: u8
15871593
-
1588-
name: nf-call-ip6-tables
1594+
name: nf-call-ip6tables
15891595
type: u8
15901596
-
15911597
name: nf-call-arptables
@@ -2077,7 +2083,7 @@ attribute-sets:
20772083
name: id
20782084
type: u16
20792085
-
2080-
name: flag
2086+
name: flags
20812087
type: binary
20822088
struct: ifla-vlan-flags
20832089
-
@@ -2165,7 +2171,7 @@ attribute-sets:
21652171
type: binary
21662172
struct: ifla-cacheinfo
21672173
-
2168-
name: icmp6-stats
2174+
name: icmp6stats
21692175
type: binary
21702176
struct: ifla-icmp6-stats
21712177
-
@@ -2179,9 +2185,10 @@ attribute-sets:
21792185
type: u32
21802186
-
21812187
name: mctp-attrs
2188+
name-prefix: ifla-mctp-
21822189
attributes:
21832190
-
2184-
name: mctp-net
2191+
name: net
21852192
type: u32
21862193
-
21872194
name: phys-binding
@@ -2453,7 +2460,6 @@ operations:
24532460
- min-mtu
24542461
- max-mtu
24552462
- prop-list
2456-
- alt-ifname
24572463
- perm-address
24582464
- proto-down-reason
24592465
- parent-dev-name

‎Documentation/netlink/specs/rt_neigh.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@ definitions:
1313
type: struct
1414
members:
1515
-
16-
name: family
16+
name: ndm-family
1717
type: u8
1818
-
19-
name: pad
19+
name: ndm-pad
2020
type: pad
2121
len: 3
2222
-
23-
name: ifindex
23+
name: ndm-ifindex
2424
type: s32
2525
-
26-
name: state
26+
name: ndm-state
2727
type: u16
2828
enum: nud-state
2929
-
30-
name: flags
30+
name: ndm-flags
3131
type: u8
3232
enum: ntf-flags
3333
-
34-
name: type
34+
name: ndm-type
3535
type: u8
3636
enum: rtm-type
3737
-
@@ -189,7 +189,7 @@ attribute-sets:
189189
type: binary
190190
display-hint: ipv4
191191
-
192-
name: lladr
192+
name: lladdr
193193
type: binary
194194
display-hint: mac
195195
-

‎MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6335,6 +6335,7 @@ F: Documentation/process/cve.rst
63356335

63366336
CW1200 WLAN driver
63376337
S: Orphan
6338+
L: linux-wireless@vger.kernel.org
63386339
F: drivers/net/wireless/st/
63396340
F: include/linux/platform_data/net-cw1200.h
63406341

@@ -14289,6 +14290,7 @@ S: Odd fixes
1428914290
F: drivers/net/ethernet/marvell/sk*
1429014291

1429114292
MARVELL LIBERTAS WIRELESS DRIVER
14293+
L: linux-wireless@vger.kernel.org
1429214294
L: libertas-dev@lists.infradead.org
1429314295
S: Orphan
1429414296
F: drivers/net/wireless/marvell/libertas/
@@ -19752,6 +19754,7 @@ F: drivers/media/tuners/qt1010*
1975219754

1975319755
QUALCOMM ATH12K WIRELESS DRIVER
1975419756
M: Jeff Johnson <jjohnson@kernel.org>
19757+
L: linux-wireless@vger.kernel.org
1975519758
L: ath12k@lists.infradead.org
1975619759
S: Supported
1975719760
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
@@ -19761,6 +19764,7 @@ N: ath12k
1976119764

1976219765
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
1976319766
M: Jeff Johnson <jjohnson@kernel.org>
19767+
L: linux-wireless@vger.kernel.org
1976419768
L: ath10k@lists.infradead.org
1976519769
S: Supported
1976619770
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
@@ -19770,6 +19774,7 @@ N: ath10k
1977019774

1977119775
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
1977219776
M: Jeff Johnson <jjohnson@kernel.org>
19777+
L: linux-wireless@vger.kernel.org
1977319778
L: ath11k@lists.infradead.org
1977419779
S: Supported
1977519780
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
@@ -22143,6 +22148,7 @@ F: drivers/platform/x86/touchscreen_dmi.c
2214322148

2214422149
SILICON LABS WIRELESS DRIVERS (for WFxxx series)
2214522150
M: Jérôme Pouiller <jerome.pouiller@silabs.com>
22151+
L: linux-wireless@vger.kernel.org
2214622152
S: Supported
2214722153
F: Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
2214822154
F: drivers/net/wireless/silabs/

‎drivers/bluetooth/btnxpuart.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,9 @@ static void nxp_coredump(struct hci_dev *hdev)
12861286
u8 pcmd = 2;
12871287

12881288
skb = nxp_drv_send_cmd(hdev, HCI_NXP_TRIGGER_DUMP, 1, &pcmd);
1289-
if (!IS_ERR(skb))
1289+
if (IS_ERR(skb))
1290+
bt_dev_err(hdev, "Failed to trigger FW Dump. (%ld)", PTR_ERR(skb));
1291+
else
12901292
kfree_skb(skb);
12911293
}
12921294

@@ -1445,9 +1447,6 @@ static int nxp_shutdown(struct hci_dev *hdev)
14451447
/* HCI_NXP_IND_RESET command may not returns any response */
14461448
if (!IS_ERR(skb))
14471449
kfree_skb(skb);
1448-
} else if (nxpdev->current_baudrate != nxpdev->fw_init_baudrate) {
1449-
nxpdev->new_baudrate = nxpdev->fw_init_baudrate;
1450-
nxp_set_baudrate_cmd(hdev, NULL);
14511450
}
14521451

14531452
return 0;
@@ -1799,13 +1798,15 @@ static void nxp_serdev_remove(struct serdev_device *serdev)
17991798
clear_bit(BTNXPUART_FW_DOWNLOADING, &nxpdev->tx_state);
18001799
wake_up_interruptible(&nxpdev->check_boot_sign_wait_q);
18011800
wake_up_interruptible(&nxpdev->fw_dnld_done_wait_q);
1802-
}
1803-
1804-
if (test_bit(HCI_RUNNING, &hdev->flags)) {
1805-
/* Ensure shutdown callback is executed before unregistering, so
1806-
* that baudrate is reset to initial value.
1801+
} else {
1802+
/* Restore FW baudrate to fw_init_baudrate if changed.
1803+
* This will ensure FW baudrate is in sync with
1804+
* driver baudrate in case this driver is re-inserted.
18071805
*/
1808-
nxp_shutdown(hdev);
1806+
if (nxpdev->current_baudrate != nxpdev->fw_init_baudrate) {
1807+
nxpdev->new_baudrate = nxpdev->fw_init_baudrate;
1808+
nxp_set_baudrate_cmd(hdev, NULL);
1809+
}
18091810
}
18101811

18111812
ps_cleanup(nxpdev);

‎drivers/bluetooth/btqca.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
889889
if (le32_to_cpu(ver.soc_id) == QCA_WCN3950_SOC_ID_T)
890890
variant = "t";
891891
else if (le32_to_cpu(ver.soc_id) == QCA_WCN3950_SOC_ID_S)
892-
variant = "u";
892+
variant = "s";
893893

894894
snprintf(config.fwname, sizeof(config.fwname),
895895
"qca/cmnv%02x%s.bin", rom_ver, variant);

‎drivers/bluetooth/btrtl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,6 +1215,8 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
12151215
rtl_dev_err(hdev, "mandatory config file %s not found",
12161216
btrtl_dev->ic_info->cfg_name);
12171217
ret = btrtl_dev->cfg_len;
1218+
if (!ret)
1219+
ret = -EINVAL;
12181220
goto err_free;
12191221
}
12201222
}

‎drivers/bluetooth/hci_vhci.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,18 +289,18 @@ static void vhci_coredump(struct hci_dev *hdev)
289289

290290
static void vhci_coredump_hdr(struct hci_dev *hdev, struct sk_buff *skb)
291291
{
292-
char buf[80];
292+
const char *buf;
293293

294-
snprintf(buf, sizeof(buf), "Controller Name: vhci_ctrl\n");
294+
buf = "Controller Name: vhci_ctrl\n";
295295
skb_put_data(skb, buf, strlen(buf));
296296

297-
snprintf(buf, sizeof(buf), "Firmware Version: vhci_fw\n");
297+
buf = "Firmware Version: vhci_fw\n";
298298
skb_put_data(skb, buf, strlen(buf));
299299

300-
snprintf(buf, sizeof(buf), "Driver: vhci_drv\n");
300+
buf = "Driver: vhci_drv\n";
301301
skb_put_data(skb, buf, strlen(buf));
302302

303-
snprintf(buf, sizeof(buf), "Vendor: vhci\n");
303+
buf = "Vendor: vhci\n";
304304
skb_put_data(skb, buf, strlen(buf));
305305
}
306306

‎drivers/net/bonding/bond_main.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -850,8 +850,9 @@ static int bond_check_dev_link(struct bonding *bond,
850850
struct net_device *slave_dev, int reporting)
851851
{
852852
const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
853-
struct ifreq ifr;
854853
struct mii_ioctl_data *mii;
854+
struct ifreq ifr;
855+
int ret;
855856

856857
if (!reporting && !netif_running(slave_dev))
857858
return 0;
@@ -860,9 +861,13 @@ static int bond_check_dev_link(struct bonding *bond,
860861
return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
861862

862863
/* Try to get link status using Ethtool first. */
863-
if (slave_dev->ethtool_ops->get_link)
864-
return slave_dev->ethtool_ops->get_link(slave_dev) ?
865-
BMSR_LSTATUS : 0;
864+
if (slave_dev->ethtool_ops->get_link) {
865+
netdev_lock_ops(slave_dev);
866+
ret = slave_dev->ethtool_ops->get_link(slave_dev);
867+
netdev_unlock_ops(slave_dev);
868+
869+
return ret ? BMSR_LSTATUS : 0;
870+
}
866871

867872
/* Ethtool can't be used, fallback to MII ioctls. */
868873
if (slave_ops->ndo_eth_ioctl) {

‎drivers/net/can/rockchip/rockchip_canfd-core.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,15 +902,16 @@ static int rkcanfd_probe(struct platform_device *pdev)
902902
priv->can.data_bittiming_const = &rkcanfd_data_bittiming_const;
903903
priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
904904
CAN_CTRLMODE_BERR_REPORTING;
905-
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
906-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
907905
priv->can.do_set_mode = rkcanfd_set_mode;
908906
priv->can.do_get_berr_counter = rkcanfd_get_berr_counter;
909907
priv->ndev = ndev;
910908

911909
match = device_get_match_data(&pdev->dev);
912-
if (match)
910+
if (match) {
913911
priv->devtype_data = *(struct rkcanfd_devtype_data *)match;
912+
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
913+
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
914+
}
914915

915916
err = can_rx_offload_add_manual(ndev, &priv->offload,
916917
RKCANFD_NAPI_WEIGHT);

0 commit comments

Comments
 (0)