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

Commit cc998ff8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull networking changes from David Miller:
 "Noteworthy changes this time around:

   1) Multicast rejoin support for team driver, from Jiri Pirko.

   2) Centralize and simplify TCP RTT measurement handling in order to
      reduce the impact of bad RTO seeding from SYN/ACKs.  Also, when
      both timestamps and local RTT measurements are available prefer
      the later because there are broken middleware devices which
      scramble the timestamp.

      From Yuchung Cheng.

   3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
      memory consumed to queue up unsend user data.  From Eric Dumazet.

   4) Add a "physical port ID" abstraction for network devices, from
      Jiri Pirko.

   5) Add a "suppress" operation to influence fib_rules lookups, from
      Stefan Tomanek.

   6) Add a networking development FAQ, from Paul Gortmaker.

   7) Extend the information provided by tcp_probe and add ipv6 support,
      from Daniel Borkmann.

   8) Use RCU locking more extensively in openvswitch data paths, from
      Pravin B Shelar.

   9) Add SCTP support to openvswitch, from Joe Stringer.

  10) Add EF10 chip support to SFC driver, from Ben Hutchings.

  11) Add new SYNPROXY netfilter target, from Patrick McHardy.

  12) Compute a rate approximation for sending in TCP sockets, and use
      this to more intelligently coalesce TSO frames.  Furthermore, add
      a new packet scheduler which takes advantage of this estimate when
      available.  From Eric Dumazet.

  13) Allow AF_PACKET fanouts with random selection, from Daniel
      Borkmann.

  14) Add ipv6 support to vxlan driver, from Cong Wang"

Resolved conflicts as per discussion.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
  openvswitch: Fix alignment of struct sw_flow_key.
  netfilter: Fix build errors with xt_socket.c
  tcp: Add missing braces to do_tcp_setsockopt
  caif: Add missing braces to multiline if in cfctrl_linkup_request
  bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
  vxlan: Fix kernel panic on device delete.
  net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
  net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
  icplus: Use netif_running to determine device state
  ethernet/arc/arc_emac: Fix huge delays in large file copies
  tuntap: orphan frags before trying to set tx timestamp
  tuntap: purge socket error queue on detach
  qlcnic: use standard NAPI weights
  ipv6:introduce function to find route for redirect
  bnx2x: VF RSS support - VF side
  bnx2x: VF RSS support - PF side
  vxlan: Notify drivers for listening UDP port changes
  net: usbnet: update addr_assign_type if appropriate
  driver/net: enic: update enic maintainers and driver
  driver/net: enic: Exposing symbols for Cisco's low latency driver
  ...
parents 57d73092 0d40f75b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@
          <title>functions/definitions</title>
!Finclude/net/mac80211.h ieee80211_rx_status
!Finclude/net/mac80211.h mac80211_rx_flags
!Finclude/net/mac80211.h mac80211_tx_info_flags
!Finclude/net/mac80211.h mac80211_tx_control_flags
!Finclude/net/mac80211.h mac80211_rate_control_flags
!Finclude/net/mac80211.h ieee80211_tx_rate
+49 −0
Original line number Diff line number Diff line
Micrel KSZ9021 Gigabit Ethernet PHY

Some boards require special tuning values, particularly when it comes to
clock delays.  You can specify clock delay values by adding
micrel-specific properties to an Ethernet OF device node.

All skew control options are specified in picoseconds.  The minimum
value is 0, and the maximum value is 3000.

Optional properties:
 - rxc-skew-ps : Skew control of RXC pad
 - rxdv-skew-ps : Skew control of RX CTL pad
 - txc-skew-ps : Skew control of TXC pad
 - txen-skew-ps : Skew control of TX_CTL pad
 - rxd0-skew-ps : Skew control of RX data 0 pad
 - rxd1-skew-ps : Skew control of RX data 1 pad
 - rxd2-skew-ps : Skew control of RX data 2 pad
 - rxd3-skew-ps : Skew control of RX data 3 pad
 - txd0-skew-ps : Skew control of TX data 0 pad
 - txd1-skew-ps : Skew control of TX data 1 pad
 - txd2-skew-ps : Skew control of TX data 2 pad
 - txd3-skew-ps : Skew control of TX data 3 pad

Examples:

	/* Attach to an Ethernet device with autodetected PHY */
	&enet {
		rxc-skew-ps = <3000>;
		rxdv-skew-ps = <0>;
		txc-skew-ps = <3000>;
		txen-skew-ps = <0>;
		status = "okay";
	};

	/* Attach to an explicitly-specified PHY */
	mdio {
		phy0: ethernet-phy@0 {
			rxc-skew-ps = <3000>;
			rxdv-skew-ps = <0>;
			txc-skew-ps = <3000>;
			txen-skew-ps = <0>;
			reg = <0>;
		};
	};
	ethernet@70000 {
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";
	};
+21 −0
Original line number Diff line number Diff line
MOXA ART Ethernet Controller

Required properties:

- compatible : Must be "moxa,moxart-mac"
- reg : Should contain register location and length
- interrupts : Should contain the mac interrupt number

Example:

	mac0: mac@90900000 {
		compatible = "moxa,moxart-mac";
		reg =	<0x90900000 0x100>;
		interrupts = <25 0>;
	};

	mac1: mac@92000000 {
		compatible = "moxa,moxart-mac";
		reg =	<0x92000000 0x100>;
		interrupts = <27 0>;
	};
+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ Required properties:
- snps,pbl		Programmable Burst Length
- snps,fixed-burst	Program the DMA to use the fixed burst mode
- snps,mixed-burst	Program the DMA to use the mixed burst mode
- snps,force_thresh_dma_mode	Force DMA to use the threshold mode for
				both tx and rx
- snps,force_sf_dma_mode	Force DMA to use the Store and Forward
				mode for both tx and rx. This flag is
				ignored if force_thresh_dma_mode is set.

Optional properties:
- mac-address: 6 bytes, mac address
+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ multiqueue.txt
	- HOWTO for multiqueue network device support.
netconsole.txt
	- The network console module netconsole.ko: configuration and notes.
netdev-FAQ.txt
	- FAQ describing how to submit net changes to netdev mailing list.
netdev-features.txt
	- Network interface features API description.
netdevices.txt
Loading