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

Commit f9da455b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull networking updates from David Miller:

 1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.

 2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
    Benniston.

 3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
    Mork.

 4) BPF now has a "random" opcode, from Chema Gonzalez.

 5) Add more BPF documentation and improve test framework, from Daniel
    Borkmann.

 6) Support TCP fastopen over ipv6, from Daniel Lee.

 7) Add software TSO helper functions and use them to support software
    TSO in mvneta and mv643xx_eth drivers.  From Ezequiel Garcia.

 8) Support software TSO in fec driver too, from Nimrod Andy.

 9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.

10) Handle broadcasts more gracefully over macvlan when there are large
    numbers of interfaces configured, from Herbert Xu.

11) Allow more control over fwmark used for non-socket based responses,
    from Lorenzo Colitti.

12) Do TCP congestion window limiting based upon measurements, from Neal
    Cardwell.

13) Support busy polling in SCTP, from Neal Horman.

14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.

15) Bridge promisc mode handling improvements from Vlad Yasevich.

16) Don't use inetpeer entries to implement ID generation any more, it
    performs poorly, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
  rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
  tcp: fixing TLP's FIN recovery
  net: fec: Add software TSO support
  net: fec: Add Scatter/gather support
  net: fec: Increase buffer descriptor entry number
  net: fec: Factorize feature setting
  net: fec: Enable IP header hardware checksum
  net: fec: Factorize the .xmit transmit function
  bridge: fix compile error when compiling without IPv6 support
  bridge: fix smatch warning / potential null pointer dereference
  via-rhine: fix full-duplex with autoneg disable
  bnx2x: Enlarge the dorq threshold for VFs
  bnx2x: Check for UNDI in uncommon branch
  bnx2x: Fix 1G-baseT link
  bnx2x: Fix link for KR with swapped polarity lane
  sctp: Fix sk_ack_backlog wrap-around problem
  net/core: Add VF link state control policy
  net/fsl: xgmac_mdio is dependent on OF_MDIO
  net/fsl: Make xgmac_mdio read error message useful
  net_sched: drr: warn when qdisc is not work conserving
  ...
parents 0e04c641 e5eca6d4
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -169,6 +169,14 @@ Description:
		"unknown", "notpresent", "down", "lowerlayerdown", "testing",
		"dormant", "up".

What:		/sys/class/net/<iface>/phys_port_id
Date:		July 2013
KernelVersion:	3.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the interface unique physical port identifier within
		the NIC, as a string.

What:		/sys/class/net/<iface>/speed
Date:		October 2009
KernelVersion:	2.6.33
+149 −0
Original line number Diff line number Diff line
What:		/sys/class/net/<iface>/cdc_ncm/min_tx_pkt
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		The driver will pad NCM Transfer Blocks (NTBs) longer
		than this to tx_max, allowing the device to receive
		tx_max sized frames with no terminating short
		packet. NTBs shorter than this limit are transmitted
		as-is, without any padding, and are terminated with a
		short USB packet.

		Padding to tx_max allows the driver to transmit NTBs
		back-to-back without any interleaving short USB
		packets.  This reduces the number of short packet
		interrupts in the device, and represents a tradeoff
		between USB bus bandwidth and device DMA optimization.

		Set to 0 to pad all frames. Set greater than tx_max to
		disable all padding.

What:		/sys/class/net/<iface>/cdc_ncm/rx_max
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		The maximum NTB size for RX.  Cannot exceed the
		maximum value supported by the device. Must allow at
		least one max sized datagram plus headers.

		The actual limits are device dependent.  See
		dwNtbInMaxSize.

		Note: Some devices will silently ignore changes to
		this value, resulting in oversized NTBs and
		corresponding framing errors.

What:		/sys/class/net/<iface>/cdc_ncm/tx_max
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		The maximum NTB size for TX.  Cannot exceed the
		maximum value supported by the device.  Must allow at
		least one max sized datagram plus headers.

		The actual limits are device dependent.  See
		dwNtbOutMaxSize.

What:		/sys/class/net/<iface>/cdc_ncm/tx_timer_usecs
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Datagram aggregation timeout in µs. The driver will
		wait up to 3 times this timeout for more datagrams to
		aggregate before transmitting an NTB frame.

		Valid range: 5 to 4000000

		Set to 0 to disable aggregation.

The following read-only attributes all represent fields of the
structure defined in section 6.2.1 "GetNtbParameters" of "Universal
Serial Bus Communications Class Subclass Specifications for Network
Control Model Devices" (CDC NCM), Revision 1.0 (Errata 1), November
24, 2010 from USB Implementers Forum, Inc.  The descriptions are
quoted from table 6-3 of CDC NCM: "NTB Parameter Structure".

What:		/sys/class/net/<iface>/cdc_ncm/bmNtbFormatsSupported
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Bit 0: 16-bit NTB supported (set to 1)
		Bit 1: 32-bit NTB supported
		Bits 2 – 15: reserved (reset to zero; must be ignored by host)

What:		/sys/class/net/<iface>/cdc_ncm/dwNtbInMaxSize
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		IN NTB Maximum Size in bytes

What:		/sys/class/net/<iface>/cdc_ncm/wNdpInDivisor
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Divisor used for IN NTB Datagram payload alignment

What:		/sys/class/net/<iface>/cdc_ncm/wNdpInPayloadRemainder
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Remainder used to align input datagram payload within
		the NTB: (Payload Offset) mod (wNdpInDivisor) =
		wNdpInPayloadRemainder

What:		/sys/class/net/<iface>/cdc_ncm/wNdpInAlignment
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		NDP alignment modulus for NTBs on the IN pipe. Shall
		be a power of 2, and shall be at least 4.

What:		/sys/class/net/<iface>/cdc_ncm/dwNtbOutMaxSize
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		OUT NTB Maximum Size

What:		/sys/class/net/<iface>/cdc_ncm/wNdpOutDivisor
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		OUT NTB Datagram alignment modulus

What:		/sys/class/net/<iface>/cdc_ncm/wNdpOutPayloadRemainder
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Remainder used to align output datagram payload
		offsets within the NTB: Padding, shall be transmitted
		as zero by function, and ignored by host.  (Payload
		Offset) mod (wNdpOutDivisor) = wNdpOutPayloadRemainder

What:		/sys/class/net/<iface>/cdc_ncm/wNdpOutAlignment
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		NDP alignment modulus for use in NTBs on the OUT
		pipe. Shall be a power of 2, and shall be at least 4.

What:		/sys/class/net/<iface>/cdc_ncm/wNtbOutMaxDatagrams
Date:		May 2014
KernelVersion:	3.16
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Maximum number of datagrams that the host may pack
		into a single OUT NTB. Zero means that the device
		imposes no limit.
+79 −0
Original line number Diff line number Diff line
What:		/sys/class/<iface>/queues/rx-<queue>/rps_cpus
Date:		March 2010
KernelVersion:	2.6.35
Contact:	netdev@vger.kernel.org
Description:
		Mask of the CPU(s) currently enabled to participate into the
		Receive Packet Steering packet processing flow for this
		network device queue. Possible values depend on the number
		of available CPU(s) in the system.

What:		/sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt
Date:		April 2010
KernelVersion:	2.6.35
Contact:	netdev@vger.kernel.org
Description:
		Number of Receive Packet Steering flows being currently
		processed by this particular network device receive queue.

What:		/sys/class/<iface>/queues/tx-<queue>/tx_timeout
Date:		November 2011
KernelVersion:	3.3
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of transmit timeout events seen by this
		network interface transmit queue.

What:		/sys/class/<iface>/queues/tx-<queue>/xps_cpus
Date:		November 2010
KernelVersion:	2.6.38
Contact:	netdev@vger.kernel.org
Description:
		Mask of the CPU(s) currently enabled to participate into the
		Transmit Packet Steering packet processing flow for this
		network device transmit queue. Possible vaules depend on the
		number of available CPU(s) in the system.

What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
Date:		November 2011
KernelVersion:	3.3
Contact:	netdev@vger.kernel.org
Description:
		Indicates the hold time in milliseconds to measure the slack
		of this particular network device transmit queue.
		Default value is 1000.

What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
Date:		November 2011
KernelVersion:	3.3
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of bytes (objects) in flight on this
		network device transmit queue.

What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit
Date:		November 2011
KernelVersion:	3.3
Contact:	netdev@vger.kernel.org
Description:
		Indicates the current limit of bytes allowed to be queued
		on this network device transmit queue. This value is clamped
		to be within the bounds defined by limit_max and limit_min.

What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
Date:		November 2011
KernelVersion:	3.3
Contact:	netdev@vger.kernel.org
Description:
		Indicates the absolute maximum limit of bytes allowed to be
		queued on this network device transmit queue. See
		include/linux/dynamic_queue_limits.h for the default value.

What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
Date:		November 2011
KernelVersion:	3.3
Contact:	netdev@vger.kernel.org
Description:
		Indicates the absolute minimum limit of bytes allowed to be
		queued on this network device transmit queue. Default value is
		0.
+201 −0
Original line number Diff line number Diff line
What:		/sys/class/<iface>/statistics/collisions
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of collisions seen by this network device.
		This value might not be relevant with all MAC layers.

What:		/sys/class/<iface>/statistics/multicast
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of multicast packets received by this
		network device.

What:		/sys/class/<iface>/statistics/rx_bytes
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of bytes received by this network device.
		See the network driver for the exact meaning of when this
		value is incremented.

What:		/sys/class/<iface>/statistics/rx_compressed
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of compressed packets received by this
		network device. This value might only be relevant for interfaces
		that support packet compression (e.g: PPP).

What:		/sys/class/<iface>/statistics/rx_crc_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets received with a CRC (FCS) error
		by this network device. Note that the specific meaning might
		depend on the MAC layer used by the interface.

What:		/sys/class/<iface>/statistics/rx_dropped
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets received by the network device
		but dropped, that are not forwarded to the upper layers for
		packet processing. See the network driver for the exact
		meaning of this value.

What:		/sys/class/<iface>/statistics/rx_fifo_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of receive FIFO errors seen by this
		network device. See the network driver for the exact
		meaning of this value.

What:		/sys/class/<iface>/statistics/rx_frame_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of received frames with error, such as
		alignment errors. Note that the specific meaning depends on
		on the MAC layer protocol used. See the network driver for
		the exact meaning of this value.

What:		/sys/class/<iface>/statistics/rx_length_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of received error packet with a length
		error, oversized or undersized. See the network driver for the
		exact meaning of this value.

What:		/sys/class/<iface>/statistics/rx_missed_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of received packets that have been missed
		due to lack of capacity in the receive side. See the network
		driver for the exact meaning of this value.

What:		/sys/class/<iface>/statistics/rx_over_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of received packets that are oversized
		compared to what the network device is configured to accept
		(e.g: larger than MTU). See the network driver for the exact
		meaning of this value.

What:		/sys/class/<iface>/statistics/rx_packets
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the total number of good packets received by this
		network device.

What:		/sys/class/<iface>/statistics/tx_aborted_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets that have been aborted
		during transmission by a network device (e.g: because of
		a medium collision). See the network driver for the exact
		meaning of this value.

What:		/sys/class/<iface>/statistics/tx_bytes
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of bytes transmitted by a network
		device. See the network driver for the exact meaning of this
		value, in particular whether this accounts for all successfully
		transmitted packets or all packets that have been queued for
		transmission.

What:		/sys/class/<iface>/statistics/tx_carrier_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets that could not be transmitted
		because of carrier errors (e.g: physical link down). See the
		network driver for the exact meaning of this value.

What:		/sys/class/<iface>/statistics/tx_compressed
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of transmitted compressed packets. Note
		this might only be relevant for devices that support
		compression (e.g: PPP).

What:		/sys/class/<iface>/statistics/tx_dropped
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets dropped during transmission.
		See the driver for the exact reasons as to why the packets were
		dropped.

What:		/sys/class/<iface>/statistics/tx_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets in error during transmission by
		a network device. See the driver for the exact reasons as to
		why the packets were dropped.

What:		/sys/class/<iface>/statistics/tx_fifo_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets having caused a transmit
		FIFO error. See the driver for the exact reasons as to why the
		packets were dropped.

What:		/sys/class/<iface>/statistics/tx_heartbeat_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets transmitted that have been
		reported as heartbeat errors. See the driver for the exact
		reasons as to why the packets were dropped.

What:		/sys/class/<iface>/statistics/tx_packets
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets transmitted by a network
		device. See the driver for whether this reports the number of all
		attempted or successful transmissions.

What:		/sys/class/<iface>/statistics/tx_window_errors
Date:		April 2005
KernelVersion:	2.6.12
Contact:	netdev@vger.kernel.org
Description:
		Indicates the number of packets not successfully transmitted
		due to a window collision. The specific meaning depends on the
		MAC layer used.  On Ethernet this is usually used to report
		late collisions errors.
+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@
!Finclude/net/cfg80211.h wdev_priv
!Finclude/net/cfg80211.h ieee80211_iface_limit
!Finclude/net/cfg80211.h ieee80211_iface_combination
!Finclude/net/cfg80211.h cfg80211_check_combinations
      </chapter>
      <chapter>
      <title>Actions and configuration</title>
Loading