Skip to content

Commit 5ca26d6

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Jakub Kicinski: "Including fixes from wireless and netfilter. The notable fixes here are the EEE fix which restores boot for many embedded platforms (real and QEMU); WiFi warning suppression and the ICE Kconfig cleanup. Current release - regressions: - phy: multiple fixes for EEE rework - wifi: wext: warn about usage only once - wifi: ath11k: allow system suspend to survive ath11k Current release - new code bugs: - mlx5: Fix memory leak in IPsec RoCE creation - ibmvnic: assign XPS map to correct queue index Previous releases - regressions: - netfilter: ip6t_rpfilter: Fix regression with VRF interfaces - netfilter: ctnetlink: make event listener tracking global - nf_tables: allow to fetch set elements when table has an owner - mlx5: - fix skb leak while fifo resync and push - fix possible ptp queue fifo use-after-free Previous releases - always broken: - sched: fix action bind logic - ptp: vclock: use mutex to fix "sleep on atomic" bug if driver also uses a mutex - netfilter: conntrack: fix rmmod double-free race - netfilter: xt_length: use skb len to match in length_mt6, avoid issues with BIG TCP Misc: - ice: remove unnecessary CONFIG_ICE_GNSS - mlx5e: remove hairpin write debugfs files - sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy" * tag 'net-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (53 commits) tcp: tcp_check_req() can be called from process context net: phy: c45: fix network interface initialization failures on xtensa, arm:cubieboard xen-netback: remove unused variables pending_idx and index net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy net: dsa: ocelot_ext: remove unnecessary phylink.h include net: mscc: ocelot: fix duplicate driver name error net: dsa: felix: fix internal MDIO controller resource length net: dsa: seville: ignore mscc-miim read errors from Lynx PCS net/sched: act_sample: fix action bind logic net/sched: act_mpls: fix action bind logic net/sched: act_pedit: fix action bind logic wifi: wext: warn about usage only once wifi: mt76: usb: fix use-after-free in mt76u_free_rx_queue qede: avoid uninitialized entries in coal_entry array nfc: fix memory leak of se_io context in nfc_genl_se_io ice: remove unnecessary CONFIG_ICE_GNSS net/sched: cls_api: Move call to tcf_exts_miss_cookie_base_destroy() ibmvnic: Assign XPS map to correct queue index docs: net: fix inaccuracies in msg_zerocopy.rst tools: net: add __pycache__ to gitignore ...
2 parents 9828184 + 580f98c commit 5ca26d6

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

+546
-318
lines changed

‎Documentation/netlink/specs/netdev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ definitions:
2828
-
2929
name: hw-offload
3030
doc:
31-
This feature informs if netdev supports XDP hw oflloading.
31+
This feature informs if netdev supports XDP hw offloading.
3232
-
3333
name: rx-sg
3434
doc:

‎Documentation/networking/msg_zerocopy.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Opportunity and Caveats
1515

1616
Copying large buffers between user process and kernel can be
1717
expensive. Linux supports various interfaces that eschew copying,
18-
such as sendpage and splice. The MSG_ZEROCOPY flag extends the
18+
such as sendfile and splice. The MSG_ZEROCOPY flag extends the
1919
underlying copy avoidance mechanism to common socket send calls.
2020

2121
Copy avoidance is not a free lunch. As implemented, with page pinning,
@@ -83,8 +83,8 @@ Pass the new flag.
8383
ret = send(fd, buf, sizeof(buf), MSG_ZEROCOPY);
8484

8585
A zerocopy failure will return -1 with errno ENOBUFS. This happens if
86-
the socket option was not set, the socket exceeds its optmem limit or
87-
the user exceeds its ulimit on locked pages.
86+
the socket exceeds its optmem limit or the user exceeds their ulimit on
87+
locked pages.
8888

8989

9090
Mixing copy avoidance and copying

‎drivers/mfd/ocelot-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static const struct mfd_cell vsc7512_devs[] = {
177177
.num_resources = ARRAY_SIZE(vsc7512_miim1_resources),
178178
.resources = vsc7512_miim1_resources,
179179
}, {
180-
.name = "ocelot-switch",
180+
.name = "ocelot-ext-switch",
181181
.of_compatible = "mscc,vsc7512-switch",
182182
.num_resources = ARRAY_SIZE(vsc7512_switch_resources),
183183
.resources = vsc7512_switch_resources,

‎drivers/net/dsa/ocelot/felix_vsc9959.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ static const char * const vsc9959_resource_names[TARGET_MAX] = {
554554
* SGMII/QSGMII MAC PCS can be found.
555555
*/
556556
static const struct resource vsc9959_imdio_res =
557-
DEFINE_RES_MEM_NAMED(0x8030, 0x8040, "imdio");
557+
DEFINE_RES_MEM_NAMED(0x8030, 0x10, "imdio");
558558

559559
static const struct reg_field vsc9959_regfields[REGFIELD_MAX] = {
560560
[ANA_ADVLEARN_VLAN_CHK] = REG_FIELD(ANA_ADVLEARN, 6, 6),

‎drivers/net/dsa/ocelot/ocelot_ext.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55

66
#include <linux/mfd/ocelot.h>
7-
#include <linux/phylink.h>
87
#include <linux/platform_device.h>
98
#include <linux/regmap.h>
109
#include <soc/mscc/ocelot.h>
@@ -149,7 +148,7 @@ MODULE_DEVICE_TABLE(of, ocelot_ext_switch_of_match);
149148

150149
static struct platform_driver ocelot_ext_switch_driver = {
151150
.driver = {
152-
.name = "ocelot-switch",
151+
.name = "ocelot-ext-switch",
153152
.of_match_table = of_match_ptr(ocelot_ext_switch_of_match),
154153
},
155154
.probe = ocelot_ext_probe,

‎drivers/net/dsa/ocelot/seville_vsc9953.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,8 +893,8 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
893893

894894
rc = mscc_miim_setup(dev, &bus, "VSC9953 internal MDIO bus",
895895
ocelot->targets[GCB],
896-
ocelot->map[GCB][GCB_MIIM_MII_STATUS & REG_MASK]);
897-
896+
ocelot->map[GCB][GCB_MIIM_MII_STATUS & REG_MASK],
897+
true);
898898
if (rc) {
899899
dev_err(dev, "failed to setup MDIO bus\n");
900900
return rc;

‎drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,10 @@ static void ibmvnic_set_affinity(struct ibmvnic_adapter *adapter)
296296

297297
rc = __netif_set_xps_queue(adapter->netdev,
298298
cpumask_bits(queue->affinity_mask),
299-
i, XPS_CPUS);
299+
i_txqs - 1, XPS_CPUS);
300300
if (rc)
301301
netdev_warn(adapter->netdev, "%s: Set XPS on queue %d failed, rc = %d.\n",
302-
__func__, i, rc);
302+
__func__, i_txqs - 1, rc);
303303
}
304304

305305
out:

‎drivers/net/ethernet/intel/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ config ICE
296296
default n
297297
depends on PCI_MSI
298298
depends on PTP_1588_CLOCK_OPTIONAL
299+
depends on GNSS || GNSS = n
299300
select AUXILIARY_BUS
300301
select DIMLIB
301302
select NET_DEVLINK
@@ -337,9 +338,6 @@ config ICE_HWTS
337338
the PTP clock driver precise cross-timestamp ioctl
338339
(PTP_SYS_OFFSET_PRECISE).
339340

340-
config ICE_GNSS
341-
def_bool GNSS = y || GNSS = ICE
342-
343341
config FM10K
344342
tristate "Intel(R) FM10000 Ethernet Switch Host Interface Support"
345343
default n

‎drivers/net/ethernet/intel/ice/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o
4747
ice-$(CONFIG_RFS_ACCEL) += ice_arfs.o
4848
ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o
4949
ice-$(CONFIG_ICE_SWITCHDEV) += ice_eswitch.o
50-
ice-$(CONFIG_ICE_GNSS) += ice_gnss.o
50+
ice-$(CONFIG_GNSS) += ice_gnss.o

‎drivers/net/ethernet/intel/ice/ice_gnss.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct gnss_serial {
4545
struct list_head queue;
4646
};
4747

48-
#if IS_ENABLED(CONFIG_ICE_GNSS)
48+
#if IS_ENABLED(CONFIG_GNSS)
4949
void ice_gnss_init(struct ice_pf *pf);
5050
void ice_gnss_exit(struct ice_pf *pf);
5151
bool ice_gnss_is_gps_present(struct ice_hw *hw);
@@ -56,5 +56,5 @@ static inline bool ice_gnss_is_gps_present(struct ice_hw *hw)
5656
{
5757
return false;
5858
}
59-
#endif /* IS_ENABLED(CONFIG_ICE_GNSS) */
59+
#endif /* IS_ENABLED(CONFIG_GNSS) */
6060
#endif /* _ICE_GNSS_H_ */

0 commit comments

Comments
 (0)