Skip to content

Commit 84809aa

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from David Miller: 1) Off by one in mt76 airtime calculation, from Dan Carpenter. 2) Fix TLV fragment allocation loop condition in iwlwifi, from Luca Coelho. 3) Don't confirm neigh entries when doing ipsec pmtu updates, from Xu Wang. 4) More checks to make sure we only send TSO packets to lan78xx chips that they can actually handle. From James Hughes. 5) Fix ip_tunnel namespace move, from William Dauchy. 6) Fix unintended packet reordering due to cooperation between listification done by GRO and non-GRO paths. From Maxim Mikityanskiy. 7) Add Jakub Kicincki formally as networking co-maintainer. 8) Info leak in airo ioctls, from Michael Ellerman. 9) IFLA_MTU attribute needs validation during rtnl_create_link(), from Eric Dumazet. 10) Use after free during reload in mlxsw, from Ido Schimmel. 11) Dangling pointers are possible in tp->highest_sack, fix from Eric Dumazet. 12) Missing *pos++ in various networking seq_next handlers, from Vasily Averin. 13) CHELSIO_GET_MEM operation neds CAP_NET_ADMIN check, from Michael Ellerman. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (109 commits) firestream: fix memory leaks net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM net: bcmgenet: Use netif_tx_napi_add() for TX NAPI tipc: change maintainer email address net: stmmac: platform: fix probe for ACPI devices net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path net/mlx5e: kTLS, Remove redundant posts in TX resync flow net/mlx5e: kTLS, Fix corner-case checks in TX resync flow net/mlx5e: Clear VF config when switching modes net/mlx5: DR, use non preemptible call to get the current cpu number net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep net/mlx5: DR, Enable counter on non-fwd-dest objects net/mlx5: Update the list of the PCI supported devices net/mlx5: Fix lowest FDB pool size net: Fix skb->csum update in inet_proto_csum_replace16(). netfilter: nf_tables: autoload modules from the abort path netfilter: nf_tables: add __nft_chain_type_get() netfilter: nf_tables_offload: fix check the chain offload flag netfilter: conntrack: sctp: use distinct states for new SCTP connections ipv6_route_seq_next should increase position index ...
2 parents f041ead + fa865ba commit 84809aa

File tree

118 files changed

+1469
-603
lines changed

Some content is hidden

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

118 files changed

+1469
-603
lines changed

Documentation/devicetree/bindings/net/fsl-fman.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,19 @@ PROPERTIES
403403
The settings and programming routines for internal/external
404404
MDIO are different. Must be included for internal MDIO.
405405

406+
- fsl,erratum-a011043
407+
Usage: optional
408+
Value type: <boolean>
409+
Definition: Indicates the presence of the A011043 erratum
410+
describing that the MDIO_CFG[MDIO_RD_ER] bit may be falsely
411+
set when reading internal PCS registers. MDIO reads to
412+
internal PCS registers may result in having the
413+
MDIO_CFG[MDIO_RD_ER] bit set, even when there is no error and
414+
read data (MDIO_DATA[MDIO_DATA]) is correct.
415+
Software may get false read error when reading internal
416+
PCS registers through MDIO. As a workaround, all internal
417+
MDIO accesses should ignore the MDIO_CFG[MDIO_RD_ER] bit.
418+
406419
For internal PHY device on internal mdio bus, a PHY node should be created.
407420
See the definition of the PHY node in booting-without-of.txt for an
408421
example of how to define a PHY (Internal PHY has no interrupt line).

MAINTAINERS

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6197,6 +6197,7 @@ ETHERNET PHY LIBRARY
61976197
M: Andrew Lunn <[email protected]>
61986198
M: Florian Fainelli <[email protected]>
61996199
M: Heiner Kallweit <[email protected]>
6200+
R: Russell King <[email protected]>
62006201
62016202
S: Maintained
62026203
F: Documentation/ABI/testing/sysfs-class-net-phydev
@@ -8569,7 +8570,7 @@ S: Maintained
85698570
F: drivers/platform/x86/intel-vbtn.c
85708571

85718572
INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
8572-
M: Stanislaw Gruszka <[email protected]>
8573+
M: Stanislaw Gruszka <[email protected]>
85738574
85748575
S: Supported
85758576
F: drivers/net/wireless/intel/iwlegacy/
@@ -11499,6 +11500,7 @@ F: drivers/net/dsa/
1149911500

1150011501
NETWORKING [GENERAL]
1150111502
M: "David S. Miller" <[email protected]>
11503+
M: Jakub Kicinski <[email protected]>
1150211504
1150311505
W: http://www.linuxfoundation.org/en/Net
1150411506
Q: http://patchwork.ozlabs.org/project/netdev/list/
@@ -13820,7 +13822,7 @@ S: Maintained
1382013822
F: arch/mips/ralink
1382113823

1382213824
RALINK RT2X00 WIRELESS LAN DRIVER
13823-
M: Stanislaw Gruszka <[email protected]>
13825+
M: Stanislaw Gruszka <[email protected]>
1382413826
M: Helmut Schaa <[email protected]>
1382513827
1382613828
S: Maintained
@@ -16601,7 +16603,7 @@ F: kernel/time/ntp.c
1660116603
F: tools/testing/selftests/timers/
1660216604

1660316605
TIPC NETWORK LAYER
16604-
M: Jon Maloy <jon.maloy@ericsson.com>
16606+
M: Jon Maloy <jmaloy@redhat.com>
1660516607
M: Ying Xue <[email protected]>
1660616608
L: [email protected] (core kernel code)
1660716609
L: [email protected] (user apps, general discussion)

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ fman@400000 {
6363
#size-cells = <0>;
6464
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6565
reg = <0xe1000 0x1000>;
66+
fsl,erratum-a011043; /* must ignore read errors */
6667

6768
pcsphy0: ethernet-phy@0 {
6869
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ fman@400000 {
6060
#size-cells = <0>;
6161
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6262
reg = <0xf1000 0x1000>;
63+
fsl,erratum-a011043; /* must ignore read errors */
6364

6465
pcsphy6: ethernet-phy@0 {
6566
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ fman@400000 {
6363
#size-cells = <0>;
6464
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6565
reg = <0xe3000 0x1000>;
66+
fsl,erratum-a011043; /* must ignore read errors */
6667

6768
pcsphy1: ethernet-phy@0 {
6869
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ fman@400000 {
6060
#size-cells = <0>;
6161
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6262
reg = <0xf3000 0x1000>;
63+
fsl,erratum-a011043; /* must ignore read errors */
6364

6465
pcsphy7: ethernet-phy@0 {
6566
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ fman@400000 {
5959
#size-cells = <0>;
6060
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6161
reg = <0xe1000 0x1000>;
62+
fsl,erratum-a011043; /* must ignore read errors */
6263

6364
pcsphy0: ethernet-phy@0 {
6465
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ fman@400000 {
5959
#size-cells = <0>;
6060
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6161
reg = <0xe3000 0x1000>;
62+
fsl,erratum-a011043; /* must ignore read errors */
6263

6364
pcsphy1: ethernet-phy@0 {
6465
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ fman@400000 {
5959
#size-cells = <0>;
6060
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6161
reg = <0xe5000 0x1000>;
62+
fsl,erratum-a011043; /* must ignore read errors */
6263

6364
pcsphy2: ethernet-phy@0 {
6465
reg = <0x0>;

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ fman@400000 {
5959
#size-cells = <0>;
6060
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
6161
reg = <0xe7000 0x1000>;
62+
fsl,erratum-a011043; /* must ignore read errors */
6263

6364
pcsphy3: ethernet-phy@0 {
6465
reg = <0x0>;

0 commit comments

Comments
 (0)