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

Pull networking updates from David Miller:
 "Here is my initial pull request for the networking subsystem during
  this merge window:

   1) Support for ESN in AH (RFC 4302) from Fan Du.

   2) Add full kernel doc for ethtool command structures, from Ben
      Hutchings.

   3) Add BCM7xxx PHY driver, from Florian Fainelli.

   4) Export computed TCP rate information in netlink socket dumps, from
      Eric Dumazet.

   5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
      Dichtel.

   6) Convert many drivers to pci_enable_msix_range(), from Alexander
      Gordeev.

   7) Record SKB timestamps more efficiently, from Eric Dumazet.

   8) Switch to microsecond resolution for TCP round trip times, also
      from Eric Dumazet.

   9) Clean up and fix 6lowpan fragmentation handling by making use of
      the existing inet_frag api for it's implementation.

  10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

  11) Auto size SKB lengths when composing netlink messages based upon
      past message sizes used, from Eric Dumazet.

  12) qdisc dumps can take a long time, add a cond_resched(), From Eric
      Dumazet.

  13) Sanitize netpoll core and drivers wrt.  SKB handling semantics.
      Get rid of never-used-in-tree netpoll RX handling.  From Eric W
      Biederman.

  14) Support inter-address-family and namespace changing in VTI tunnel
      driver(s).  From Steffen Klassert.

  15) Add Altera TSE driver, from Vince Bridgers.

  16) Optimizing csum_replace2() so that it doesn't adjust the checksum
      by checksumming the entire header, from Eric Dumazet.

  17) Expand BPF internal implementation for faster interpreting, more
      direct translations into JIT'd code, and much cleaner uses of BPF
      filtering in non-socket ocntexts.  From Daniel Borkmann and Alexei
      Starovoitov"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
  netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
  net: Add a test to see if a skb is freeable in irq context
  qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
  net: ptp: move PTP classifier in its own file
  net: sxgbe: make "core_ops" static
  net: sxgbe: fix logical vs bitwise operation
  net: sxgbe: sxgbe_mdio_register() frees the bus
  Call efx_set_channels() before efx->type->dimension_resources()
  xen-netback: disable rogue vif in kthread context
  net/mlx4: Set proper build dependancy with vxlan
  be2net: fix build dependency on VxLAN
  mac802154: make csma/cca parameters per-wpan
  mac802154: allow only one WPAN to be up at any given time
  net: filter: minor: fix kdoc in __sk_run_filter
  netlink: don't compare the nul-termination in nla_strcmp
  can: c_can: Avoid led toggling for every packet.
  can: c_can: Simplify TX interrupt cleanup
  can: c_can: Store dlc private
  can: c_can: Reduce register access
  can: c_can: Make the code readable
  ...

4 files changed, 248 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-mdio b/Documentation/ABI/testing/sysfs-bus-mdio
index 6349749ebc29..491baaf4285f 100644
--- a/Documentation/ABI/testing/sysfs-bus-mdio
+++ b/Documentation/ABI/testing/sysfs-bus-mdio
@@ -7,3 +7,23 @@ Description:
                 by the device during bus enumeration, encoded in hexadecimal.
                 This ID is used to match the device with the appropriate
                 driver.
+
+What:           /sys/bus/mdio_bus/devices/.../phy_interface
+Date:           February 2014
+KernelVersion:  3.15
+Contact:        netdev@vger.kernel.org
+Description:
+                This attribute contains the PHY interface as configured by the
+                Ethernet driver during bus enumeration, encoded in string.
+                This interface mode is used to configure the Ethernet MAC with the
+                appropriate mode for its data lines to the PHY hardware.
+
+What:           /sys/bus/mdio_bus/devices/.../phy_has_fixups
+Date:           February 2014
+KernelVersion:  3.15
+Contact:        netdev@vger.kernel.org
+Description:
+                This attribute contains the boolean value whether a given PHY
+                device has had any "fixup" workaround running on it, encoded as
+                a boolean. This information is provided to help troubleshooting
+                PHY configurations.
diff --git a/Documentation/ABI/testing/sysfs-class-net b/Documentation/ABI/testing/sysfs-class-net
new file mode 100644
index 000000000000..d922060e455d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-net
@@ -0,0 +1,199 @@
+What:           /sys/class/net/<iface>/addr_assign_type
+Date:           July 2010
+KernelVersion:  3.2
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the address assignment type. Possible values are:
+                0: permanent address
+                1: randomly generated
+                2: stolen from another device
+                3: set using dev_set_mac_address
+
+What:           /sys/class/net/<iface>/addr_len
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the hardware address size in bytes.
+                Values vary based on the lower-level protocol used by the
+                interface (Ethernet, FDDI, ATM, IEEE 802.15.4...). See
+                include/uapi/linux/if_*.h for actual values.
+
+What:           /sys/class/net/<iface>/address
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Hardware address currently assigned to this interface.
+                Format is a string, e.g: 00:11:22:33:44:55 for an Ethernet MAC
+                address.
+
+What:           /sys/class/net/<iface>/broadcast
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Hardware broadcast address for this interface. Format is a
+                string, e.g: ff:ff:ff:ff:ff:ff for an Ethernet broadcast MAC
+                address.
+
+What:           /sys/class/net/<iface>/carrier
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the current physical link state of the interface.
+                Posssible values are:
+                0: physical link is down
+                1: physical link is up
+
+                Note: some special devices, e.g: bonding and team drivers will
+                allow this attribute to be written to force a link state for
+                operating correctly and designating another fallback interface.
+
+What:           /sys/class/net/<iface>/dev_id
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the device unique identifier. Format is an hexadecimal
+                value. This is used to disambiguate interfaces which might be
+                stacked (e.g: VLAN interfaces) but still have the same MAC
+                address as their parent device.
+
+What:           /sys/class/net/<iface>/dormant
+Date:           March 2006
+KernelVersion:  2.6.17
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates whether the interface is in dormant state. Possible
+                values are:
+                0: interface is not dormant
+                1: interface is dormant
+
+                This attribute can be used by supplicant software to signal that
+                the device is not usable unless some supplicant-based
+                authentication is performed (e.g: 802.1x). 'link_mode' attribute
+                will also reflect the dormant state.
+
+What:           /sys/clas/net/<iface>/duplex
+Date:           October 2009
+KernelVersion:  2.6.33
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface latest or current duplex value. Possible
+                values are:
+                half: half duplex
+                full: full duplex
+
+                Note: This attribute is only valid for interfaces that implement
+                the ethtool get_settings method (mostly Ethernet).
+
+What:           /sys/class/net/<iface>/flags
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface flags as a bitmask in hexadecimal. See
+                include/uapi/linux/if.h for a list of all possible values and
+                the flags semantics.
+
+What:           /sys/class/net/<iface>/ifalias
+Date:           September 2008
+KernelVersion:  2.6.28
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates/stores an interface alias name as a string. This can
+                be used for system management purposes.
+
+What:           /sys/class/net/<iface>/ifindex
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the system-wide interface unique index identifier as a
+                decimal number. This attribute is used for mapping an interface
+                identifier to an interface name. It is used throughout the
+                networking stack for specifying the interface specific
+                requests/events.
+
+What:           /sys/class/net/<iface>/iflink
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the system-wide interface unique index identifier a
+                the interface is linked to. Format is decimal. This attribute is
+                used to resolve interfaces chaining, linking and stacking.
+                Physical interfaces have the same 'ifindex' and 'iflink' values.
+
+What:           /sys/class/net/<iface>/link_mode
+Date:           March 2006
+KernelVersion:  2.6.17
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface link mode, as a decimal number. This
+                attribute should be used in conjunction with 'dormant' attribute
+                to determine the interface usability. Possible values:
+                0: default link mode
+                1: dormant link mode
+
+What:           /sys/class/net/<iface>/mtu
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface currently configured MTU value, in
+                bytes, and in decimal format. Specific values depends on the
+                lower-level interface protocol used. Ethernet devices will show
+                a 'mtu' attribute value of 1500 unless changed.
+
+What:           /sys/calss/net/<iface>/netdev_group
+Date:           January 2011
+KernelVersion:  2.6.39
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface network device group, as a decimal
+                integer. Default value is 0 which corresponds to the initial
+                network devices group. The group can be changed to affect
+                routing decisions (see: net/ipv4/fib_rules and
+                net/ipv6/fib6_rules.c).
+
+What:           /sys/class/net/<iface>/operstate
+Date:           March 2006
+KernelVersion:  2.6.17
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface RFC2863 operational state as a string.
+                Possible values are:
+                "unknown", "notpresent", "down", "lowerlayerdown", "testing",
+                "dormant", "up".
+
+What:           /sys/class/net/<iface>/speed
+Date:           October 2009
+KernelVersion:  2.6.33
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface latest or current speed value. Value is
+                an integer representing the link speed in Mbits/sec.
+
+                Note: this attribute is only valid for interfaces that implement
+                the ethtool get_settings method (mostly Ethernet ).
+
+What:           /sys/class/net/<iface>/tx_queue_len
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface transmit queue len in number of packets,
+                as an integer value. Value depend on the type of interface,
+                Ethernet network adapters have a default value of 1000 unless
+                configured otherwise
+
+What:           /sys/class/net/<iface>/type
+Date:           April 2005
+KernelVersion:  2.6.12
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the interface protocol type as a decimal value. See
+                include/uapi/linux/if_arp.h for all possible values.
diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh
index 4793d3dff6af..c46406296631 100644
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -76,6 +76,15 @@ Description:
                 is used to classify clients as "isolated" by the
                 Extended Isolation feature.
 
+What:           /sys/class/net/<mesh_iface>/mesh/multicast_mode
+Date:           Feb 2014
+Contact:        Linus Lüssing <linus.luessing@web.de>
+Description:
+                Indicates whether multicast optimizations are enabled
+                or disabled. If set to zero then all nodes in the
+                mesh are going to use classic flooding for any
+                multicast packet with no optimizations.
+
 What:           /sys/class/net/<mesh_iface>/mesh/network_coding
 Date:           Nov 2012
 Contact:        Martin Hundeboll <martin@hundeboll.net>
diff --git a/Documentation/ABI/testing/sysfs-ptp b/Documentation/ABI/testing/sysfs-ptp
index 05aeedf17794..44806a678f12 100644
--- a/Documentation/ABI/testing/sysfs-ptp
+++ b/Documentation/ABI/testing/sysfs-ptp
@@ -54,6 +54,26 @@ Description:
                 This file contains the number of programmable periodic
                 output channels offered by the PTP hardware clock.
 
+What:           /sys/class/ptp/ptpN/n_pins
+Date:           March 2014
+Contact:        Richard Cochran <richardcochran@gmail.com>
+Description:
+                This file contains the number of programmable pins
+                offered by the PTP hardware clock.
+
+What:           /sys/class/ptp/ptpN/pins
+Date:           March 2014
+Contact:        Richard Cochran <richardcochran@gmail.com>
+Description:
+                This directory contains one file for each programmable
+                pin offered by the PTP hardware clock. The file name
+                is the hardware dependent pin name. Reading from this
+                file produces two numbers, the assigned function (see
+                the PTP_PF_ enumeration values in linux/ptp_clock.h)
+                and the channel number. The function and channel
+                assignment may be changed by two writing numbers into
+                the file.
+
 What:           /sys/class/ptp/ptpN/pps_avaiable
 Date:           September 2010
 Contact:        Richard Cochran <richardcochran@gmail.com>