Commit cd8dead0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:
 "Just the usual assortment of small'ish fixes:

   1) Conntrack timeout is sometimes not initialized properly, from
      Alexander Potapenko.

   2) Add a reasonable range limit to tcp_min_rtt_wlen to avoid
      undefined behavior. From ZhangXiaoxu.

   3) des1 field of descriptor in stmmac driver is initialized with the
      wrong variable. From Yue Haibing.

   4) Increase mlxsw pci sw reset timeout a little bit more, from Ido
      Schimmel.

   5) Match IOT2000 stmmac devices more accurately, from Su Bao Cheng.

   6) Fallback refcount fix in TLS code, from Jakub Kicinski.

   7) Fix max MTU check when using XDP in mlx5, from Maxim Mikityanskiy.

   8) Fix recursive locking in team driver, from Hangbin Liu.

   9) Fix tls_set_device_offload_Rx() deadlock, from Jakub Kicinski.

  10) Don't use napi_alloc_frag() outside of softiq context of socionext
      driver, from Ilias Apalodimas.

  11) MAC address increment overflow in ncsi, from Tao Ren.

  12) Fix a regression in 8K/1M pool switching of RDS, from Zhu Yanjun.

  13) ipv4_link_failure has to validate the headers that are actually
      there because RAW sockets can pass in arbitrary garbage, from Eric
      Dumazet"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
  ipv4: add sanity checks in ipv4_link_failure()
  net/rose: fix unbound loop in rose_loopback_timer()
  rxrpc: fix race condition in rxrpc_input_packet()
  net: rds: exchange of 8K and 1M pool
  net: vrf: Fix operation not supported when set vrf mac
  net/ncsi: handle overflow when incrementing mac address
  net: socionext: replace napi_alloc_frag with the netdev variant on init
  net: atheros: fix spelling mistake "underun" -> "underrun"
  spi: ST ST95HF NFC: declare missing of table
  spi: Micrel eth switch: declare missing of table
  net: stmmac: move stmmac_check_ether_addr() to driver probe
  netfilter: fix nf_l4proto_log_invalid to log invalid packets
  netfilter: never get/set skb->tstamp
  netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON
  Documentation: decnet: remove reference to CONFIG_DECNET_ROUTE_FWMARK
  dt-bindings: add an explanation for internal phy-mode
  net/tls: don't leak IV and record seq when offload fails
  net/tls: avoid potential deadlock in tls_set_device_offload_rx()
  selftests/net: correct the return value for run_afpackettests
  team: fix possible recursive locking when add slaves
  ...
parents 11bfe647 20ff83f1

Documentation/devicetree/bindings/net/davinci_emac.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ Required properties: 
Optional properties:

- phy-handle: See ethernet.txt file in the same directory.

              If absent, davinci_emac driver defaults to 100/FULL.

- nvmem-cells: phandle, reference to an nvmem node for the MAC address

- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used

- ti,davinci-rmii-en: 1 byte, 1 means use RMII

- ti,davinci-no-bd-ram: boolean, does EMAC have BD RAM?

Documentation/devicetree/bindings/net/ethernet.txt

+2 −3
Original line number Diff line number Diff line
@@ -10,15 +10,14 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt. 
  the boot program; should be used in cases where the MAC address assigned to

  the device by the boot program is different from the "local-mac-address"

  property;

- nvmem-cells: phandle, reference to an nvmem node for the MAC address;

- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used;

- max-speed: number, specifies maximum speed in Mbit/s supported by the device;

- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than

  the maximum frame size (there's contradiction in the Devicetree

  Specification).

- phy-mode: string, operation mode of the PHY interface. This is now a de-facto

  standard property; supported values are:

  * "internal"

  * "internal" (Internal means there is not a standard bus between the MAC and

     the PHY, something proprietary is being used to embed the PHY in the MAC.)

  * "mii"

  * "gmii"

  * "sgmii"

Documentation/devicetree/bindings/net/macb.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ Required properties: 
	Optional elements: 'tsu_clk'

- clocks: Phandles to input clocks.



Optional properties:

- nvmem-cells: phandle, reference to an nvmem node for the MAC address

- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used



Optional properties for PHY child node:

- reset-gpios : Should specify the gpio for phy reset

- magic-packet : If present, indicates that the hardware supports waking

Documentation/networking/decnet.txt

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ you'll need the following options as well... 
    CONFIG_DECNET_ROUTER (to be able to add/delete routes)

    CONFIG_NETFILTER (will be required for the DECnet routing daemon)



    CONFIG_DECNET_ROUTE_FWMARK is optional



Don't turn on SIOCGIFCONF support for DECnet unless you are really sure

that you need it, in general you won't and it can cause ifconfig to

malfunction.

Documentation/networking/ip-sysctl.txt

+1 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ tcp_min_rtt_wlen - INTEGER 
	minimum RTT when it is moved to a longer path (e.g., due to traffic

	engineering). A longer window makes the filter more resistant to RTT

	inflations such as transient congestion. The unit is seconds.

	Possible values: 0 - 86400 (1 day)

	Default: 300



tcp_moderate_rcvbuf - BOOLEAN

CRA Git | Maintained and supported by SUSTech CRA and CCSE