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

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

 1) Support busy polling generically, for all NAPI drivers.  From Eric
    Dumazet.

 2) Add byte/packet counter support to nft_ct, from Floriani Westphal.

 3) Add RSS/XPS support to mvneta driver, from Gregory Clement.

 4) Implement IPV6_HDRINCL socket option for raw sockets, from Hannes
    Frederic Sowa.

 5) Add support for T6 adapter to cxgb4 driver, from Hariprasad Shenai.

 6) Add support for VLAN device bridging to mlxsw switch driver, from
    Ido Schimmel.

 7) Add driver for Netronome NFP4000/NFP6000, from Jakub Kicinski.

 8) Provide hwmon interface to mlxsw switch driver, from Jiri Pirko.

 9) Reorganize wireless drivers into per-vendor directories just like we
    do for ethernet drivers.  From Kalle Valo.

10) Provide a way for administrators "destroy" connected sockets via the
    SOCK_DESTROY socket netlink diag operation.  From Lorenzo Colitti.

11) Add support to add/remove multicast routes via netlink, from Nikolay
    Aleksandrov.

12) Make TCP keepalive settings per-namespace, from Nikolay Borisov.

13) Add forwarding and packet duplication facilities to nf_tables, from
    Pablo Neira Ayuso.

14) Dead route support in MPLS, from Roopa Prabhu.

15) TSO support for thunderx chips, from Sunil Goutham.

16) Add driver for IBM's System i/p VNIC protocol, from Thomas Falcon.

17) Rationalize, consolidate, and more completely document the checksum
    offloading facilities in the networking stack.  From Tom Herbert.

18) Support aborting an ongoing scan in mac80211/cfg80211, from
    Vidyullatha Kanchanapally.

19) Use per-bucket spinlock for bpf hash facility, from Tom Leiming.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1375 commits)
  net: bnxt: always return values from _bnxt_get_max_rings
  net: bpf: reject invalid shifts
  phonet: properly unshare skbs in phonet_rcv()
  dwc_eth_qos: Fix dma address for multi-fragment skbs
  phy: remove an unneeded condition
  mdio: remove an unneed condition
  mdio_bus: NULL dereference on allocation error
  net: Fix typo in netdev_intersect_features
  net: freescale: mac-fec: Fix build error from phy_device API change
  net: freescale: ucc_geth: Fix build error from phy_device API change
  bonding: Prevent IPv6 link local address on enslaved devices
  IB/mlx5: Add flow steering support
  net/mlx5_core: Export flow steering API
  net/mlx5_core: Make ipv4/ipv6 location more clear
  net/mlx5_core: Enable flow steering support for the IB driver
  net/mlx5_core: Initialize namespaces only when supported by device
  net/mlx5_core: Set priority attributes
  net/mlx5_core: Connect flow tables
  net/mlx5_core: Introduce modify flow table command
  net/mlx5_core: Managing root flow table
  ...
parents c597b6bc 415b6f19
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
@@ -19,6 +19,25 @@ Description:
		Set to 0 to pad all frames. Set greater than tx_max to
		disable all padding.

What:		/sys/class/net/<iface>/cdc_ncm/ndp_to_end
Date:		Dec 2015
KernelVersion:	4.5
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Boolean attribute showing the status of the "NDP to
		end" quirk.  Defaults to 'N', except for devices
		already known to need it enabled.

		The "NDP to end" quirk makes the driver place the NDP
		(the packet index table) after the payload.  The NCM
		specification does not mandate this, but some devices
		are known to be more restrictive. Write 'Y' to this
		attribute for temporary testing of a suspect device
		failing to work with the default driver settings.

		A device entry should be added to the driver if this
		quirk is found to be required.

What:		/sys/class/net/<iface>/cdc_ncm/rx_max
Date:		May 2014
KernelVersion:	3.16
+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Description:

What:           /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation
Date:           May 2011
Contact:        Antonio Quartulli <antonio@meshcoding.com>
Contact:        Antonio Quartulli <a@unstable.cc>
Description:
                Indicates whether the data traffic going from a
                wireless client to another wireless client will be
@@ -70,7 +70,7 @@ Description:

What:		/sys/class/net/<mesh_iface>/mesh/isolation_mark
Date:		Nov 2013
Contact:	Antonio Quartulli <antonio@meshcoding.com>
Contact:	Antonio Quartulli <a@unstable.cc>
Description:
		Defines the isolation mark (and its bitmask) which
		is used to classify clients as "isolated" by the
+23 −0
Original line number Diff line number Diff line
What:		/sys/class/net/<iface>/qmi/raw_ip
Date:		Dec 2015
KernelVersion:	4.4
Contact:	Bjørn Mork <bjorn@mork.no>
Description:
		Boolean.  Default: 'N'

		Set this to 'Y' to change the network device link
		framing from '802.3' to 'raw-ip'.

		The netdev will change to reflect the link framing
		mode.  The netdev is an ordinary ethernet device in
		'802.3' mode, and the driver expects to exchange
		frames with an ethernet header over the USB link. The
		netdev is a headerless p-t-p device in 'raw-ip' mode,
		and the driver expects to echange IPv4 or IPv6 packets
		without any L2 header over the USB link.

		Userspace is in full control of firmware configuration
		through the delegation of the QMI protocol. Userspace
		is responsible for coordination of driver and firmware
		link framing mode, changing this setting to 'Y' if the
		firmware is configured for 'raw-ip' mode.
+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ A switch child node has the following optional property:
			  switch. Must be set if the switch can not detect
			  the presence and/or size of a connected EEPROM,
			  otherwise optional.
- reset-gpios		: phandle and specifier to a gpio line connected to
			  reset pin of the switch chip.

A switch may have multiple "port" children nodes

@@ -114,6 +116,7 @@ Example:
			#size-cells = <0>;
			reg = <17 1>;	/* MDIO address 17, switch 1 in tree */
			mii-bus = <&mii_bus1>;
			reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;

			switch1port0: port@0 {
				reg = <0>;
+6 −1
Original line number Diff line number Diff line
Hisilicon MDIO bus controller

Properties:
- compatible: "hisilicon,mdio","hisilicon,hns-mdio".
- compatible: can be one of:
	"hisilicon,hns-mdio"
	"hisilicon,mdio"
  "hisilicon,hns-mdio" is recommended to be used for hip05 and later SOCs,
  while "hisilicon,mdio" is optional for backwards compatibility only on
  hip04 Soc.
- reg: The base address of the MDIO bus controller register bank.
- #address-cells: Must be <1>.
- #size-cells: Must be <0>.  MDIO addresses have no size component.
Loading