Skip to content

Commit 4784dc9

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from David Miller: 1) Fix type of bind option flag in af_xdp, from Baruch Siach. 2) Fix use after free in bpf_xdp_link_release(), from Xuan Zhao. 3) PM refcnt imbakance in r8152, from Takashi Iwai. 4) Sign extension ug in liquidio, from Colin Ian King. 5) Mising range check in s390 bpf jit, from Colin Ian King. 6) Uninit value in caif_seqpkt_sendmsg(), from Ziyong Xuan. 7) Fix skb page recycling race, from Ilias Apalodimas. 8) Fix memory leak in tcindex_partial_destroy_work, from Pave Skripkin. 9) netrom timer sk refcnt issues, from Nguyen Dinh Phi. 10) Fix data races aroun tcp's tfo_active_disable_stamp, from Eric Dumazet. 11) act_skbmod should only operate on ethernet packets, from Peilin Ye. 12) Fix slab out-of-bpunds in fib6_nh_flush_exceptions(),, from Psolo Abeni. 13) Fix sparx5 dependencies, from Yajun Deng. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (74 commits) dpaa2-switch: seed the buffer pool after allocating the swp net: sched: cls_api: Fix the the wrong parameter net: sparx5: fix unmet dependencies warning net: dsa: tag_ksz: dont let the hardware process the layer 4 checksum net: dsa: ensure linearized SKBs in case of tail taggers ravb: Remove extra TAB ravb: Fix a typo in comment net: dsa: sja1105: make VID 4095 a bridge VLAN too tcp: disable TFO blackhole logic by default sctp: do not update transport pathmtu if SPP_PMTUD_ENABLE is not set net: ixp46x: fix ptp build failure ibmvnic: Remove the proper scrq flush selftests: net: add ESP-in-UDP PMTU test udp: check encap socket in __udp_lib_err sctp: update active_key for asoc when old key is being replaced r8169: Avoid duplicate sysfs entry creation error ixgbe: Fix packet corruption due to missing DMA sync Revert "qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()" ipv6: fix another slab-out-of-bounds in fib6_nh_flush_exceptions fsl/fman: Add fibre support ...
2 parents 5e09e19 + 7aaa0f3 commit 4784dc9

Some content is hidden

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

77 files changed

+1217
-269
lines changed

‎Documentation/devicetree/bindings/net/imx-dwmac.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/nxp,dwmac-imx.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP i.MX8 DWMAC glue layer Device Tree Bindings
8+
9+
maintainers:
10+
- Joakim Zhang <qiangqing.zhang@nxp.com>
11+
12+
# We need a select here so we don't match all nodes with 'snps,dwmac'
13+
select:
14+
properties:
15+
compatible:
16+
contains:
17+
enum:
18+
- nxp,imx8mp-dwmac-eqos
19+
- nxp,imx8dxl-dwmac-eqos
20+
required:
21+
- compatible
22+
23+
allOf:
24+
- $ref: "snps,dwmac.yaml#"
25+
26+
properties:
27+
compatible:
28+
oneOf:
29+
- items:
30+
- enum:
31+
- nxp,imx8mp-dwmac-eqos
32+
- nxp,imx8dxl-dwmac-eqos
33+
- const: snps,dwmac-5.10a
34+
35+
clocks:
36+
minItems: 3
37+
maxItems: 5
38+
items:
39+
- description: MAC host clock
40+
- description: MAC apb clock
41+
- description: MAC timer clock
42+
- description: MAC RGMII TX clock
43+
- description: EQOS MEM clock
44+
45+
clock-names:
46+
minItems: 3
47+
maxItems: 5
48+
contains:
49+
enum:
50+
- stmmaceth
51+
- pclk
52+
- ptp_ref
53+
- tx
54+
- mem
55+
56+
intf_mode:
57+
$ref: /schemas/types.yaml#/definitions/phandle-array
58+
description:
59+
Should be phandle/offset pair. The phandle to the syscon node which
60+
encompases the GPR register, and the offset of the GPR register.
61+
62+
snps,rmii_refclk_ext:
63+
$ref: /schemas/types.yaml#/definitions/flag
64+
description:
65+
To select RMII reference clock from external.
66+
67+
required:
68+
- compatible
69+
- clocks
70+
- clock-names
71+
72+
unevaluatedProperties: false
73+
74+
examples:
75+
- |
76+
#include <dt-bindings/interrupt-controller/arm-gic.h>
77+
#include <dt-bindings/interrupt-controller/irq.h>
78+
#include <dt-bindings/clock/imx8mp-clock.h>
79+
80+
eqos: ethernet@30bf0000 {
81+
compatible = "nxp,imx8mp-dwmac-eqos","snps,dwmac-5.10a";
82+
reg = <0x30bf0000 0x10000>;
83+
interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
84+
<GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
85+
interrupt-names = "macirq", "eth_wake_irq";
86+
clocks = <&clk IMX8MP_CLK_ENET_QOS_ROOT>,
87+
<&clk IMX8MP_CLK_QOS_ENET_ROOT>,
88+
<&clk IMX8MP_CLK_ENET_QOS_TIMER>,
89+
<&clk IMX8MP_CLK_ENET_QOS>;
90+
clock-names = "stmmaceth", "pclk", "ptp_ref", "tx";
91+
phy-mode = "rgmii";
92+
status = "disabled";
93+
};

‎Documentation/devicetree/bindings/net/snps,dwmac.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ select:
2828
- snps,dwmac-4.00
2929
- snps,dwmac-4.10a
3030
- snps,dwmac-4.20a
31+
- snps,dwmac-5.10a
3132
- snps,dwxgmac
3233
- snps,dwxgmac-2.10
3334

@@ -82,6 +83,7 @@ properties:
8283
- snps,dwmac-4.00
8384
- snps,dwmac-4.10a
8485
- snps,dwmac-4.20a
86+
- snps,dwmac-5.10a
8587
- snps,dwxgmac
8688
- snps,dwxgmac-2.10
8789

@@ -375,6 +377,7 @@ allOf:
375377
- snps,dwmac-4.00
376378
- snps,dwmac-4.10a
377379
- snps,dwmac-4.20a
380+
- snps,dwmac-5.10a
378381
- snps,dwxgmac
379382
- snps,dwxgmac-2.10
380383
- st,spear600-gmac

‎Documentation/networking/af_xdp.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,16 +243,16 @@ Configuration Flags and Socket Options
243243
These are the various configuration flags that can be used to control
244244
and monitor the behavior of AF_XDP sockets.
245245

246-
XDP_COPY and XDP_ZERO_COPY bind flags
247-
-------------------------------------
246+
XDP_COPY and XDP_ZEROCOPY bind flags
247+
------------------------------------
248248

249249
When you bind to a socket, the kernel will first try to use zero-copy
250250
copy. If zero-copy is not supported, it will fall back on using copy
251251
mode, i.e. copying all packets out to user space. But if you would
252252
like to force a certain mode, you can use the following flags. If you
253253
pass the XDP_COPY flag to the bind call, the kernel will force the
254254
socket into copy mode. If it cannot use copy mode, the bind call will
255-
fail with an error. Conversely, the XDP_ZERO_COPY flag will force the
255+
fail with an error. Conversely, the XDP_ZEROCOPY flag will force the
256256
socket into zero-copy mode or fail.
257257

258258
XDP_SHARED_UMEM bind flag

‎Documentation/networking/ip-sysctl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ tcp_fastopen_blackhole_timeout_sec - INTEGER
826826
initial value when the blackhole issue goes away.
827827
0 to disable the blackhole detection.
828828

829-
By default, it is set to 1hr.
829+
By default, it is set to 0 (feature is disabled).
830830

831831
tcp_fastopen_key - list of comma separated 32-digit hexadecimal INTEGERs
832832
The list consists of a primary key and an optional backup key. The

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11758,6 +11758,7 @@ F: drivers/char/hw_random/mtk-rng.c
1175811758
MEDIATEK SWITCH DRIVER
1175911759
M: Sean Wang <sean.wang@mediatek.com>
1176011760
M: Landen Chao <Landen.Chao@mediatek.com>
11761+
M: DENG Qingfang <dqfext@gmail.com>
1176111762
L: netdev@vger.kernel.org
1176211763
S: Maintained
1176311764
F: drivers/net/dsa/mt7530.*

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -821,9 +821,9 @@
821821
eqos: ethernet@30bf0000 {
822822
compatible = "nxp,imx8mp-dwmac-eqos", "snps,dwmac-5.10a";
823823
reg = <0x30bf0000 0x10000>;
824-
interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
825-
<GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>;
826-
interrupt-names = "eth_wake_irq", "macirq";
824+
interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
825+
<GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
826+
interrupt-names = "macirq", "eth_wake_irq";
827827
clocks = <&clk IMX8MP_CLK_ENET_QOS_ROOT>,
828828
<&clk IMX8MP_CLK_QOS_ENET_ROOT>,
829829
<&clk IMX8MP_CLK_ENET_QOS_TIMER>,

‎arch/s390/net/bpf_jit_comp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static inline void reg_set_seen(struct bpf_jit *jit, u32 b1)
112112
{
113113
u32 r1 = reg2hex[b1];
114114

115-
if (!jit->seen_reg[r1] && r1 >= 6 && r1 <= 15)
115+
if (r1 >= 6 && r1 <= 15 && !jit->seen_reg[r1])
116116
jit->seen_reg[r1] = 1;
117117
}
118118

‎drivers/net/bonding/bond_main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3450,7 +3450,9 @@ static int bond_master_netdev_event(unsigned long event,
34503450
return bond_event_changename(event_bond);
34513451
case NETDEV_UNREGISTER:
34523452
bond_remove_proc_entry(event_bond);
3453+
#ifdef CONFIG_XFRM_OFFLOAD
34533454
xfrm_dev_state_flush(dev_net(bond_dev), bond_dev, true);
3455+
#endif /* CONFIG_XFRM_OFFLOAD */
34543456
break;
34553457
case NETDEV_REGISTER:
34563458
bond_create_proc_entry(event_bond);

‎drivers/net/dsa/mt7530.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid,
366366
int i;
367367

368368
reg[1] |= vid & CVID_MASK;
369+
if (vid > 1)
370+
reg[1] |= ATA2_IVL;
369371
reg[2] |= (aging & AGE_TIMER_MASK) << AGE_TIMER;
370372
reg[2] |= (port_mask & PORT_MAP_MASK) << PORT_MAP;
371373
/* STATIC_ENT indicate that entry is static wouldn't

0 commit comments

Comments
 (0)