Commit 6be35c70 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 changes from David Miller:

1) Allow to dump, monitor, and change the bridge multicast database
   using netlink.  From Cong Wang.

2) RFC 5961 TCP blind data injection attack mitigation, from Eric
   Dumazet.

3) Networking user namespace support from Eric W. Biederman.

4) tuntap/virtio-net multiqueue support by Jason Wang.

5) Support for checksum offload of encapsulated packets (basically,
   tunneled traffic can still be checksummed by HW).  From Joseph
   Gasparakis.

6) Allow BPF filter access to VLAN tags, from Eric Dumazet and
   Daniel Borkmann.

7) Bridge port parameters over netlink and BPDU blocking support
   from Stephen Hemminger.

8) Improve data access patterns during inet socket demux by rearranging
   socket layout, from Eric Dumazet.

9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and
   Jon Maloy.

10) Update TCP socket hash sizing to be more in line with current day
    realities.  The existing heurstics were choosen a decade ago.
    From Eric Dumazet.

11) Fix races, queue bloat, and excessive wakeups in ATM and
    associated drivers, from Krzysztof Mazur and David Woodhouse.

12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions
    in VXLAN driver, from David Stevens.

13) Add "oops_only" mode to netconsole, from Amerigo Wang.

14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also
    allow DCB netlink to work on namespaces other than the initial
    namespace.  From John Fastabend.

15) Support PTP in the Tigon3 driver, from Matt Carlson.

16) tun/vhost zero copy fixes and improvements, plus turn it on
    by default, from Michael S. Tsirkin.

17) Support per-association statistics in SCTP, from Michele
    Baldessari.

And many, many, driver updates, cleanups, and improvements.  Too
numerous to mention individually.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
  net/mlx4_en: Add support for destination MAC in steering rules
  net/mlx4_en: Use generic etherdevice.h functions.
  net: ethtool: Add destination MAC address to flow steering API
  bridge: add support of adding and deleting mdb entries
  bridge: notify mdb changes via netlink
  ndisc: Unexport ndisc_{build,send}_skb().
  uapi: add missing netconf.h to export list
  pkt_sched: avoid requeues if possible
  solos-pci: fix double-free of TX skb in DMA mode
  bnx2: Fix accidental reversions.
  bna: Driver Version Updated to 3.1.2.1
  bna: Firmware update
  bna: Add RX State
  bna: Rx Page Based Allocation
  bna: TX Intr Coalescing Fix
  bna: Tx and Rx Optimizations
  bna: Code Cleanup and Enhancements
  ath9k: check pdata variable before dereferencing it
  ath5k: RX timestamp is reported at end of frame
  ath9k_htc: RX timestamp is reported at end of frame
  ...
parents e37aa63e 520dfe3a

Documentation/ABI/testing/sysfs-bus-mdio

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		/sys/bus/mdio_bus/devices/.../phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the 32-bit PHY Identifier as reported

		by the device during bus enumeration, encoded in hexadecimal.

		This ID is used to match the device with the appropriate

		driver.

Documentation/ABI/testing/sysfs-class-net-batman-adv

+6 −5
Original line number Diff line number Diff line 


What:           /sys/class/net/<iface>/batman-adv/iface_status

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Indicates the status of <iface> as it is seen by batman.



What:           /sys/class/net/<iface>/batman-adv/mesh_iface

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>
@@ -7,8 +13,3 @@ Description: 
                displays the batman mesh interface this <iface>

                currently is associated with.

What:           /sys/class/net/<iface>/batman-adv/iface_status

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Indicates the status of <iface> as it is seen by batman.

Documentation/ABI/testing/sysfs-class-net-grcan

0 → 100644
+35 −0
Original line number Diff line number Diff line 


What:		/sys/class/net/<iface>/grcan/enable0

Date:		October 2012

KernelVersion:	3.8

Contact:	Andreas Larsson <andreas@gaisler.com>

Description:

		Hardware configuration of physical interface 0. This file reads

		and writes the "Enable 0" bit of the configuration register.

		Possible values: 0 or 1. See the GRCAN chapter of the GRLIB IP

		core library documentation for details. The default value is 0

		or set by the module parameter grcan.enable0 and can be read at

		/sys/module/grcan/parameters/enable0.



What:		/sys/class/net/<iface>/grcan/enable1

Date:		October 2012

KernelVersion:	3.8

Contact:	Andreas Larsson <andreas@gaisler.com>

Description:

		Hardware configuration of physical interface 1. This file reads

		and writes the "Enable 1" bit of the configuration register.

		Possible values: 0 or 1. See the GRCAN chapter of the GRLIB IP

		core library documentation for details. The default value is 0

		or set by the module parameter grcan.enable1 and can be read at

		/sys/module/grcan/parameters/enable1.



What:		/sys/class/net/<iface>/grcan/select

Date:		October 2012

KernelVersion:	3.8

Contact:	Andreas Larsson <andreas@gaisler.com>

Description:

		Configuration of which physical interface to be used. Possible

		values: 0 or 1. See the GRCAN chapter of the GRLIB IP core

		library documentation for details. The default value is 0 or is

		set by the module parameter grcan.select and can be read at

		/sys/module/grcan/parameters/select.

Documentation/ABI/testing/sysfs-class-net-mesh

+20 −20
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ Description: 
                Indicates whether the batman protocol messages of the

                mesh <mesh_iface> shall be aggregated or not.



What:           /sys/class/net/<mesh_iface>/mesh/ap_isolation

Date:           May 2011

Contact:        Antonio Quartulli <ordex@autistici.org>

Description:

                Indicates whether the data traffic going from a

                wireless client to another wireless client will be

                silently dropped.



What:           /sys/class/net/<mesh_iface>/mesh/bonding

Date:           June 2010

Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
@@ -31,14 +39,6 @@ Description: 
                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.



What:		/sys/class/net/<mesh_iface>/mesh/ap_isolation

Date:		May 2011

Contact:	Antonio Quartulli <ordex@autistici.org>

Description:

		Indicates whether the data traffic going from a

		wireless client to another wireless client will be

		silently dropped.



What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>
@@ -60,13 +60,6 @@ Description: 
                Defines the selection criteria this node will use

                to choose a gateway if gw_mode was set to 'client'.



What:           /sys/class/net/<mesh_iface>/mesh/orig_interval

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the interval in milliseconds in which batman

                sends its protocol messages.



What:           /sys/class/net/<mesh_iface>/mesh/hop_penalty

Date:           Oct 2010

Contact:        Linus Lüssing <linus.luessing@web.de>
@@ -74,6 +67,13 @@ Description: 
                Defines the penalty which will be applied to an

                originator message's tq-field on every hop.



What:           /sys/class/net/<mesh_iface>/mesh/orig_interval

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the interval in milliseconds in which batman

                sends its protocol messages.



What:           /sys/class/net/<mesh_iface>/mesh/routing_algo

Date:           Dec 2011

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Documentation/devicetree/bindings/net/can/grcan.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Aeroflex Gaisler GRCAN and GRHCAN CAN controllers.



The GRCAN and CRHCAN CAN controllers are available in the GRLIB VHDL IP core

library.



Note: These properties are built from the AMBA plug&play in a Leon SPARC system

(the ordinary environment for GRCAN and GRHCAN). There are no dts files for

sparc.



Required properties:



- name : Should be "GAISLER_GRCAN", "01_03d", "GAISLER_GRHCAN" or "01_034"



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



- freq : Frequency of the external oscillator clock in Hz (the frequency of

	the amba bus in the ordinary case)



- interrupts : Interrupt number for this device



Optional properties:



- systemid : If not present or if the value of the least significant 16 bits

	of this 32-bit property is smaller than GRCAN_TXBUG_SAFE_GRLIB_VERSION

	a bug workaround is activated.



For further information look in the documentation for the GLIB IP core library:

http://www.gaisler.com/products/grlib/grip.pdf

CRA Git | Maintained and supported by SUSTech CRA and CCSE