Commit 02dc96ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) Sanity check URB networking device parameters to avoid divide by
    zero, from Oliver Neukum.

 2) Disable global multicast filter in NCSI, otherwise LLDP and IPV6
    don't work properly. Longer term this needs a better fix tho. From
    Vijay Khemka.

 3) Small fixes to selftests (use ping when ping6 is not present, etc.)
    from David Ahern.

 4) Bring back rt_uses_gateway member of struct rtable, it's semantics
    were not well understood and trying to remove it broke things. From
    David Ahern.

 5) Move usbnet snaity checking, ignore endpoints with invalid
    wMaxPacketSize. From Bjørn Mork.

 6) Missing Kconfig deps for sja1105 driver, from Mao Wenan.

 7) Various small fixes to the mlx5 DR steering code, from Alaa Hleihel,
    Alex Vesker, and Yevgeny Kliteynik

 8) Missing CAP_NET_RAW checks in various places, from Ori Nimron.

 9) Fix crash when removing sch_cbs entry while offloading is enabled,
    from Vinicius Costa Gomes.

10) Signedness bug fixes, generally in looking at the result given by
    of_get_phy_mode() and friends. From Dan Crapenter.

11) Disable preemption around BPF_PROG_RUN() calls, from Eric Dumazet.

12) Don't create VRF ipv6 rules if ipv6 is disabled, from David Ahern.

13) Fix quantization code in tcp_bbr, from Kevin Yang.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (127 commits)
  net: tap: clean up an indentation issue
  nfp: abm: fix memory leak in nfp_abm_u32_knode_replace
  tcp: better handle TCP_USER_TIMEOUT in SYN_SENT state
  sk_buff: drop all skb extensions on free and skb scrubbing
  tcp_bbr: fix quantization code to not raise cwnd if not probing bandwidth
  mlxsw: spectrum_flower: Fail in case user specifies multiple mirror actions
  Documentation: Clarify trap's description
  mlxsw: spectrum: Clear VLAN filters during port initialization
  net: ena: clean up indentation issue
  NFC: st95hf: clean up indentation issue
  net: phy: micrel: add Asym Pause workaround for KSZ9021
  net: socionext: ave: Avoid using netdev_err() before calling register_netdev()
  ptp: correctly disable flags on old ioctls
  lib: dimlib: fix help text typos
  net: dsa: microchip: Always set regmap stride to 1
  nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs
  nfp: flower: prevent memory leak in nfp_flower_spawn_phy_reprs
  net/sched: Set default of CONFIG_NET_TC_SKB_EXT to N
  vrf: Do not attempt to create IPv6 mcast rule if IPv6 is disabled
  net: sched: sch_sfb: don't call qdisc_put() while holding tree lock
  ...
parents edf445ad faeacb6d

Documentation/devicetree/bindings/net/adi,adin.yaml

+0 −7
Original line number Diff line number Diff line
@@ -36,12 +36,6 @@ properties: 
    enum: [ 4, 8, 12, 16, 20, 24 ]

    default: 8



  adi,disable-energy-detect:

    description: |

      Disables Energy Detect Powerdown Mode (default disabled, i.e energy detect

      is enabled if this property is unspecified)

    type: boolean



examples:

  - |

    ethernet {
@@ -68,6 +62,5 @@ examples: 
            reg = <1>;



            adi,fifo-depth-bits = <16>;

            adi,disable-energy-detect;

        };

    };

Documentation/devicetree/bindings/net/micrel-ksz90x1.txt

+30 −2
Original line number Diff line number Diff line
@@ -12,8 +12,36 @@ and therefore may overwrite them. 
KSZ9021:



  All skew control options are specified in picoseconds. The minimum

  value is 0, the maximum value is 3000, and it is incremented by 200ps

  steps.

  value is 0, the maximum value is 3000, and it can be specified in 200ps

  steps, *but* these values are in not fact what you get because this chip's

  skew values actually increase in 120ps steps, starting from -840ps. The

  incorrect values came from an error in the original KSZ9021 datasheet

  before it was corrected in revision 1.2 (Feb 2014), but it is too late to

  change the driver now because of the many existing device trees that have

  been created using values that go up in increments of 200.



  The following table shows the actual skew delay you will get for each of the

  possible devicetree values, and the number that will be programmed into the

  corresponding pad skew register:



  Device Tree Value	Delay	Pad Skew Register Value

  -----------------------------------------------------

	0   		-840ps		0000

	200 		-720ps		0001

	400 		-600ps		0010

	600 		-480ps		0011

	800 		-360ps		0100

	1000		-240ps		0101

	1200		-120ps		0110

	1400		   0ps		0111

	1600		 120ps		1000

	1800		 240ps		1001

	2000		 360ps		1010

	2200		 480ps		1011

	2400		 600ps		1100

	2600		 720ps		1101

	2800		 840ps		1110

	3000		 960ps		1111



  Optional properties:

Documentation/devicetree/bindings/net/renesas,ravb.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
		R-Car Gen2 and RZ/G1 devices.



      - "renesas,etheravb-r8a774a1" for the R8A774A1 SoC.

      - "renesas,etheravb-r8a774b1" for the R8A774B1 SoC.

      - "renesas,etheravb-r8a774c0" for the R8A774C0 SoC.

      - "renesas,etheravb-r8a7795" for the R8A7795 SoC.

      - "renesas,etheravb-r8a7796" for the R8A7796 SoC.

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ properties: 
    const: stmmaceth



  mac-mode:

    maxItems: 1

    $ref: ethernet-controller.yaml#/properties/phy-connection-type

    description:

      The property is identical to 'phy-mode', and assumes that there is mode

      converter in-between the MAC & PHY (e.g. GMII-to-RGMII). This converter

Documentation/networking/devlink-trap.rst

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ be added to the following table: 
   * - ``port_list_is_empty``

     - ``drop``

     - Traps packets that the device decided to drop in case they need to be

       flooded and the flood list is empty

       flooded (e.g., unknown unicast, unregistered multicast) and there are

       no ports the packets should be flooded to

   * - ``port_loopback_filter``

     - ``drop``

     - Traps packets that the device decided to drop in case after layer 2

CRA Git | Maintained and supported by SUSTech CRA and CCSE