forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
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 ...
- Loading branch information
Showing
1,739 changed files
with
70,829 additions
and
25,686 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]> | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ Description: | |
|
||
What: /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation | ||
Date: May 2011 | ||
Contact: Antonio Quartulli <[email protected]> | ||
Contact: Antonio Quartulli <[email protected]> | ||
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 <[email protected]> | ||
Contact: Antonio Quartulli <[email protected]> | ||
Description: | ||
Defines the isolation mark (and its bitmask) which | ||
is used to classify clients as "isolated" by the | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
What: /sys/class/net/<iface>/qmi/raw_ip | ||
Date: Dec 2015 | ||
KernelVersion: 4.4 | ||
Contact: Bjørn Mork <[email protected]> | ||
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
* ADF7242 IEEE 802.15.4 * | ||
|
||
Required properties: | ||
- compatible: should be "adi,adf7242" | ||
- spi-max-frequency: maximal bus speed (12.5 MHz) | ||
- reg: the chipselect index | ||
- interrupts: the interrupt generated by the device via pin IRQ1. | ||
IRQ_TYPE_LEVEL_HIGH (4) or IRQ_TYPE_EDGE_FALLING (1) | ||
|
||
Example: | ||
|
||
adf7242@0 { | ||
compatible = "adi,adf7242"; | ||
spi-max-frequency = <10000000>; | ||
reg = <0>; | ||
interrupts = <98 IRQ_TYPE_LEVEL_HIGH>; | ||
interrupt-parent = <&gpio3>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
* STMicroelectronics : NFC Transceiver ST95HF | ||
|
||
ST NFC Transceiver is required to attach with SPI bus. | ||
ST95HF node should be defined in DT as SPI slave device of SPI | ||
master with which ST95HF transceiver is physically connected. | ||
The properties defined below are required to be the part of DT | ||
to include ST95HF transceiver into the platform. | ||
|
||
Required properties: | ||
=================== | ||
- reg: Address of SPI slave "ST95HF transceiver" on SPI master bus. | ||
|
||
- compatible: should be "st,st95hf" for ST95HF NFC transceiver | ||
|
||
- spi-max-frequency: Max. operating SPI frequency for ST95HF | ||
transceiver. | ||
|
||
- enable-gpio: GPIO line to enable ST95HF transceiver. | ||
|
||
- interrupt-parent : Standard way to specify the controller to which | ||
ST95HF transceiver's interrupt is routed. | ||
|
||
- interrupts : Standard way to define ST95HF transceiver's out | ||
interrupt. | ||
|
||
Optional property: | ||
================= | ||
- st95hfvin-supply : This is an optional property. It contains a | ||
phandle to ST95HF transceiver's regulator supply node in DT. | ||
|
||
Example: | ||
======= | ||
spi@9840000 { | ||
reg = <0x9840000 0x110>; | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
cs-gpios = <&pio0 4>; | ||
status = "okay"; | ||
|
||
st95hf@0{ | ||
reg = <0>; | ||
compatible = "st,st95hf"; | ||
status = "okay"; | ||
spi-max-frequency = <1000000>; | ||
enable-gpio = <&pio4 0>; | ||
interrupt-parent = <&pio0>; | ||
interrupts = <7 IRQ_TYPE_EDGE_FALLING>; | ||
}; | ||
|
||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.