Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull networking updates from David Miller:

 1) More iov_iter conversion work from Al Viro.

    [ The "crypto: switch af_alg_make_sg() to iov_iter" commit was
      wrong, and this pull actually adds an extra commit on top of the
      branch I'm pulling to fix that up, so that the pre-merge state is
      ok.   - Linus ]

 2) Various optimizations to the ipv4 forwarding information base trie
    lookup implementation.  From Alexander Duyck.

 3) Remove sock_iocb altogether, from CHristoph Hellwig.

 4) Allow congestion control algorithm selection via routing metrics.
    From Daniel Borkmann.

 5) Make ipv4 uncached route list per-cpu, from Eric Dumazet.

 6) Handle rfs hash collisions more gracefully, also from Eric Dumazet.

 7) Add xmit_more support to r8169, e1000, and e1000e drivers.  From
    Florian Westphal.

 8) Transparent Ethernet Bridging support for GRO, from Jesse Gross.

 9) Add BPF packet actions to packet scheduler, from Jiri Pirko.

10) Add support for uniqu flow IDs to openvswitch, from Joe Stringer.

11) New NetCP ethernet driver, from Muralidharan Karicheri and Wingman
    Kwok.

12) More sanely handle out-of-window dupacks, which can result in
    serious ACK storms.  From Neal Cardwell.

13) Various rhashtable bug fixes and enhancements, from Herbert Xu,
    Patrick McHardy, and Thomas Graf.

14) Support xmit_more in be2net, from Sathya Perla.

15) Group Policy extensions for vxlan, from Thomas Graf.

16) Remove Checksum Offload support for vxlan, from Tom Herbert.

17) Like ipv4, support lockless transmit over ipv6 UDP sockets.  From
    Vlad Yasevich.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1494+1 commits)
  crypto: fix af_alg_make_sg() conversion to iov_iter
  ipv4: Namespecify TCP PMTU mechanism
  i40e: Fix for stats init function call in Rx setup
  tcp: don't include Fast Open option in SYN-ACK on pure SYN-data
  openvswitch: Only set TUNNEL_VXLAN_OPT if VXLAN-GBP metadata is set
  ipv6: Make __ipv6_select_ident static
  ipv6: Fix fragment id assignment on LE arches.
  bridge: Fix inability to add non-vlan fdb entry
  net: Mellanox: Delete unnecessary checks before the function call "vunmap"
  cxgb4: Add support in cxgb4 to get expansion rom version via ethtool
  ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion ROM version
  net: dsa: Remove redundant phy_attach()
  IB/mlx4: Reset flow support for IB kernel ULPs
  IB/mlx4: Always use the correct port for mirrored multicast attachments
  net/bonding: Fix potential bad memory access during bonding events
  tipc: remove tipc_snprintf
  tipc: nl compat add noop and remove legacy nl framework
  tipc: convert legacy nl stats show to nl compat
  tipc: convert legacy nl net id get to nl compat
  tipc: convert legacy nl net id set to nl compat
  ...
parents 29afc4e9 9399f0c5

Documentation/DocBook/80211.tmpl

+2 −3
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ 
!Finclude/net/cfg80211.h cfg80211_beacon_data

!Finclude/net/cfg80211.h cfg80211_ap_settings

!Finclude/net/cfg80211.h station_parameters

!Finclude/net/cfg80211.h station_info_flags

!Finclude/net/cfg80211.h rate_info_flags

!Finclude/net/cfg80211.h rate_info

!Finclude/net/cfg80211.h station_info
@@ -435,7 +434,6 @@ 
      <section id="ps-client">

        <title>support for powersaving clients</title>

!Pinclude/net/mac80211.h AP support for powersaving clients

      </section>

!Finclude/net/mac80211.h ieee80211_get_buffered_bc

!Finclude/net/mac80211.h ieee80211_beacon_get

!Finclude/net/mac80211.h ieee80211_sta_eosp
@@ -444,6 +442,7 @@ 
!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni

!Finclude/net/mac80211.h ieee80211_sta_set_buffered

!Finclude/net/mac80211.h ieee80211_sta_block_awake

      </section>

      </chapter>



      <chapter id="multi-iface">
@@ -488,8 +487,8 @@ 
          <title>RX A-MPDU aggregation</title>

!Pnet/mac80211/agg-rx.c RX A-MPDU aggregation

!Cnet/mac80211/agg-rx.c

        </sect1>

!Finclude/net/mac80211.h ieee80211_ampdu_mlme_action

        </sect1>

      </chapter>



      <chapter id="smps">

Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

+21 −0
Original line number Diff line number Diff line
@@ -7,17 +7,38 @@ Required properties: 
   - SerDes Rx/Tx registers

   - SerDes integration registers (1/2)

   - SerDes integration registers (2/2)

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- interrupts: Should contain the amd-xgbe-phy interrupt.



Optional properties:

- amd,speed-set: Speed capabilities of the device

    0 - 1GbE and 10GbE (default)

    1 - 2.5GbE and 10GbE



The following optional properties are represented by an array with each

value corresponding to a particular speed. The first array value represents

the setting for the 1GbE speed, the second value for the 2.5GbE speed and

the third value for the 10GbE speed.  All three values are required if the

property is used.

- amd,serdes-blwc: Baseline wandering correction enablement

    0 - Off

    1 - On

- amd,serdes-cdr-rate: CDR rate speed selection

- amd,serdes-pq-skew: PQ (data sampling) skew

- amd,serdes-tx-amp: TX amplitude boost



Example:

	xgbe_phy@e1240800 {

		compatible = "amd,xgbe-phy-seattle-v1a", "ethernet-phy-ieee802.3-c45";

		reg = <0 0xe1240800 0 0x00400>,

		      <0 0xe1250000 0 0x00060>,

		      <0 0xe1250080 0 0x00004>;

		interrupt-parent = <&gic>;

		interrupts = <0 323 4>;

		amd,speed-set = <0>;

		amd,serdes-blwc = <1>, <1>, <0>;

		amd,serdes-cdr-rate = <2>, <2>, <7>;

		amd,serdes-pq-skew = <10>, <10>, <30>;

		amd,serdes-tx-amp = <15>, <15>, <10>;

	};

Documentation/devicetree/bindings/net/davicom-dm9000.txt

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

- davicom,no-eeprom : Configuration EEPROM is not available

- davicom,ext-phy : Use external PHY

- reset-gpios : phandle of gpio that will be used to reset chip during probe

- vcc-supply : phandle of regulator that will be used to enable power to chip



Example:
@@ -21,4 +23,6 @@ Example: 
		interrupts = <7 4>;

		local-mac-address = [00 00 de ad be ef];

		davicom,no-eeprom;

		reset-gpios = <&gpf 12 GPIO_ACTIVE_LOW>;

		vcc-supply = <&eth0_power>;

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional properties: 
- fsl,num-rx-queues : The property is valid for enet-avb IP, which supports

  hw multi queues. Should specify the rx queue number, otherwise set rx queue

  number to 1.

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

  up via magic packet.



Optional subnodes:

- mdio : specifies the mdio bus in the FEC, used as a container for phy nodes

Documentation/devicetree/bindings/net/fsl-tsec-phy.txt

+10 −1
Original line number Diff line number Diff line
@@ -8,7 +8,16 @@ of how to define a PHY. 
Required properties:

  - reg : Offset and length of the register set for the device

  - compatible : Should define the compatible device type for the

    mdio.  Currently, this is most likely to be "fsl,gianfar-mdio"

    mdio. Currently supported strings/devices are:

	- "fsl,gianfar-tbi"

	- "fsl,gianfar-mdio"

	- "fsl,etsec2-tbi"

	- "fsl,etsec2-mdio"

	- "fsl,ucc-mdio"

	- "fsl,fman-mdio"

    When device_type is "mdio", the following strings are also considered:

	- "gianfar"

	- "ucc_geth_phy"



Example: