Skip to content

Commit 6be35c7

Browse files
torvaldstorvalds
committed
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 ...
2 parents e37aa63 + 520dfe3 commit 6be35c7

File tree

1,353 files changed

+82940
-34585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,353 files changed

+82940
-34585
lines changed

‎Documentation/ABI/testing/sysfs-bus-mdio‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/mdio_bus/devices/.../phy_id
2+
Date: November 2012
3+
KernelVersion: 3.8
4+
Contact: netdev@vger.kernel.org
5+
Description:
6+
This attribute contains the 32-bit PHY Identifier as reported
7+
by the device during bus enumeration, encoded in hexadecimal.
8+
This ID is used to match the device with the appropriate
9+
driver.

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
What: /sys/class/net/<iface>/batman-adv/iface_status
3+
Date: May 2010
4+
Contact: Marek Lindner <lindner_marek@yahoo.de>
5+
Description:
6+
Indicates the status of <iface> as it is seen by batman.
7+
28
What: /sys/class/net/<iface>/batman-adv/mesh_iface
39
Date: May 2010
410
Contact: Marek Lindner <lindner_marek@yahoo.de>
@@ -7,8 +13,3 @@ Description:
713
displays the batman mesh interface this <iface>
814
currently is associated with.
915

10-
What: /sys/class/net/<iface>/batman-adv/iface_status
11-
Date: May 2010
12-
Contact: Marek Lindner <lindner_marek@yahoo.de>
13-
Description:
14-
Indicates the status of <iface> as it is seen by batman.

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
What: /sys/class/net/<iface>/grcan/enable0
3+
Date: October 2012
4+
KernelVersion: 3.8
5+
Contact: Andreas Larsson <andreas@gaisler.com>
6+
Description:
7+
Hardware configuration of physical interface 0. This file reads
8+
and writes the "Enable 0" bit of the configuration register.
9+
Possible values: 0 or 1. See the GRCAN chapter of the GRLIB IP
10+
core library documentation for details. The default value is 0
11+
or set by the module parameter grcan.enable0 and can be read at
12+
/sys/module/grcan/parameters/enable0.
13+
14+
What: /sys/class/net/<iface>/grcan/enable1
15+
Date: October 2012
16+
KernelVersion: 3.8
17+
Contact: Andreas Larsson <andreas@gaisler.com>
18+
Description:
19+
Hardware configuration of physical interface 1. This file reads
20+
and writes the "Enable 1" bit of the configuration register.
21+
Possible values: 0 or 1. See the GRCAN chapter of the GRLIB IP
22+
core library documentation for details. The default value is 0
23+
or set by the module parameter grcan.enable1 and can be read at
24+
/sys/module/grcan/parameters/enable1.
25+
26+
What: /sys/class/net/<iface>/grcan/select
27+
Date: October 2012
28+
KernelVersion: 3.8
29+
Contact: Andreas Larsson <andreas@gaisler.com>
30+
Description:
31+
Configuration of which physical interface to be used. Possible
32+
values: 0 or 1. See the GRCAN chapter of the GRLIB IP core
33+
library documentation for details. The default value is 0 or is
34+
set by the module parameter grcan.select and can be read at
35+
/sys/module/grcan/parameters/select.

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ Description:
66
Indicates whether the batman protocol messages of the
77
mesh <mesh_iface> shall be aggregated or not.
88

9+
What: /sys/class/net/<mesh_iface>/mesh/ap_isolation
10+
Date: May 2011
11+
Contact: Antonio Quartulli <ordex@autistici.org>
12+
Description:
13+
Indicates whether the data traffic going from a
14+
wireless client to another wireless client will be
15+
silently dropped.
16+
917
What: /sys/class/net/<mesh_iface>/mesh/bonding
1018
Date: June 2010
1119
Contact: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
@@ -31,14 +39,6 @@ Description:
3139
mesh will be fragmented or silently discarded if the
3240
packet size exceeds the outgoing interface MTU.
3341

34-
What: /sys/class/net/<mesh_iface>/mesh/ap_isolation
35-
Date: May 2011
36-
Contact: Antonio Quartulli <ordex@autistici.org>
37-
Description:
38-
Indicates whether the data traffic going from a
39-
wireless client to another wireless client will be
40-
silently dropped.
41-
4242
What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
4343
Date: October 2010
4444
Contact: Marek Lindner <lindner_marek@yahoo.de>
@@ -60,26 +60,26 @@ Description:
6060
Defines the selection criteria this node will use
6161
to choose a gateway if gw_mode was set to 'client'.
6262

63+
What: /sys/class/net/<mesh_iface>/mesh/hop_penalty
64+
Date: Oct 2010
65+
Contact: Linus Lüssing <linus.luessing@web.de>
66+
Description:
67+
Defines the penalty which will be applied to an
68+
originator message's tq-field on every hop.
69+
6370
What: /sys/class/net/<mesh_iface>/mesh/orig_interval
6471
Date: May 2010
6572
Contact: Marek Lindner <lindner_marek@yahoo.de>
6673
Description:
6774
Defines the interval in milliseconds in which batman
6875
sends its protocol messages.
6976

70-
What: /sys/class/net/<mesh_iface>/mesh/hop_penalty
71-
Date: Oct 2010
72-
Contact: Linus Lüssing <linus.luessing@web.de>
73-
Description:
74-
Defines the penalty which will be applied to an
75-
originator message's tq-field on every hop.
76-
77-
What: /sys/class/net/<mesh_iface>/mesh/routing_algo
78-
Date: Dec 2011
79-
Contact: Marek Lindner <lindner_marek@yahoo.de>
77+
What: /sys/class/net/<mesh_iface>/mesh/routing_algo
78+
Date: Dec 2011
79+
Contact: Marek Lindner <lindner_marek@yahoo.de>
8080
Description:
81-
Defines the routing procotol this mesh instance
82-
uses to find the optimal paths through the mesh.
81+
Defines the routing procotol this mesh instance
82+
uses to find the optimal paths through the mesh.
8383

8484
What: /sys/class/net/<mesh_iface>/mesh/vis_mode
8585
Date: May 2010

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Aeroflex Gaisler GRCAN and GRHCAN CAN controllers.
2+
3+
The GRCAN and CRHCAN CAN controllers are available in the GRLIB VHDL IP core
4+
library.
5+
6+
Note: These properties are built from the AMBA plug&play in a Leon SPARC system
7+
(the ordinary environment for GRCAN and GRHCAN). There are no dts files for
8+
sparc.
9+
10+
Required properties:
11+
12+
- name : Should be "GAISLER_GRCAN", "01_03d", "GAISLER_GRHCAN" or "01_034"
13+
14+
- reg : Address and length of the register set for the device
15+
16+
- freq : Frequency of the external oscillator clock in Hz (the frequency of
17+
the amba bus in the ordinary case)
18+
19+
- interrupts : Interrupt number for this device
20+
21+
Optional properties:
22+
23+
- systemid : If not present or if the value of the least significant 16 bits
24+
of this 32-bit property is smaller than GRCAN_TXBUG_SAFE_GRLIB_VERSION
25+
a bug workaround is activated.
26+
27+
For further information look in the documentation for the GLIB IP core library:
28+
http://www.gaisler.com/products/grlib/grip.pdf

‎Documentation/devicetree/bindings/net/cdns-emac.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
* Cadence EMAC Ethernet controller
2+
3+
Required properties:
4+
- compatible: Should be "cdns,[<chip>-]{emac}"
5+
Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
6+
or the generic form: "cdns,emac".
7+
- reg: Address and length of the register set for the device
8+
- interrupts: Should contain macb interrupt
9+
- phy-mode: String, operation mode of the PHY interface.
10+
Supported values are: "mii", "rmii".
11+
12+
Optional properties:
13+
- local-mac-address: 6 bytes, mac address
14+
15+
Examples:
16+
17+
macb0: ethernet@fffc4000 {
18+
compatible = "cdns,at91rm9200-emac";
19+
reg = <0xfffc4000 0x4000>;
20+
interrupts = <21>;
21+
phy-mode = "rmii";
22+
local-mac-address = [3a 0e 03 04 05 06];
23+
};

‎Documentation/devicetree/bindings/net/cpsw.txt‎

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,15 @@ Required properties:
99
number
1010
- interrupt-parent : The parent interrupt controller
1111
- cpdma_channels : Specifies number of channels in CPDMA
12-
- host_port_no : Specifies host port shift
13-
- cpdma_reg_ofs : Specifies CPDMA submodule register offset
14-
- cpdma_sram_ofs : Specifies CPDMA SRAM offset
15-
- ale_reg_ofs : Specifies ALE submodule register offset
1612
- ale_entries : Specifies No of entries ALE can hold
17-
- host_port_reg_ofs : Specifies host port register offset
18-
- hw_stats_reg_ofs : Specifies hardware statistics register offset
19-
- bd_ram_ofs : Specifies internal desciptor RAM offset
2013
- bd_ram_size : Specifies internal descriptor RAM size
2114
- rx_descs : Specifies number of Rx descriptors
2215
- mac_control : Specifies Default MAC control register content
2316
for the specific platform
2417
- slaves : Specifies number for slaves
25-
- slave_reg_ofs : Specifies slave register offset
26-
- sliver_reg_ofs : Specifies slave sliver register offset
18+
- cpts_active_slave : Specifies the slave to use for time stamping
19+
- cpts_clock_mult : Numerator to convert input clock ticks into nanoseconds
20+
- cpts_clock_shift : Denominator to convert input clock ticks into nanoseconds
2721
- phy_id : Specifies slave phy id
2822
- mac-address : Specifies slave MAC address
2923

@@ -45,30 +39,22 @@ Examples:
4539
interrupts = <55 0x4>;
4640
interrupt-parent = <&intc>;
4741
cpdma_channels = <8>;
48-
host_port_no = <0>;
49-
cpdma_reg_ofs = <0x800>;
50-
cpdma_sram_ofs = <0xa00>;
51-
ale_reg_ofs = <0xd00>;
5242
ale_entries = <1024>;
53-
host_port_reg_ofs = <0x108>;
54-
hw_stats_reg_ofs = <0x900>;
55-
bd_ram_ofs = <0x2000>;
5643
bd_ram_size = <0x2000>;
5744
no_bd_ram = <0>;
5845
rx_descs = <64>;
5946
mac_control = <0x20>;
6047
slaves = <2>;
48+
cpts_active_slave = <0>;
49+
cpts_clock_mult = <0x80000000>;
50+
cpts_clock_shift = <29>;
6151
cpsw_emac0: slave@0 {
62-
slave_reg_ofs = <0x208>;
63-
sliver_reg_ofs = <0xd80>;
64-
phy_id = "davinci_mdio.16:00";
52+
phy_id = <&davinci_mdio>, <0>;
6553
/* Filled in by U-Boot */
6654
mac-address = [ 00 00 00 00 00 00 ];
6755
};
6856
cpsw_emac1: slave@1 {
69-
slave_reg_ofs = <0x308>;
70-
sliver_reg_ofs = <0xdc0>;
71-
phy_id = "davinci_mdio.16:01";
57+
phy_id = <&davinci_mdio>, <1>;
7258
/* Filled in by U-Boot */
7359
mac-address = [ 00 00 00 00 00 00 ];
7460
};
@@ -79,30 +65,22 @@ Examples:
7965
compatible = "ti,cpsw";
8066
ti,hwmods = "cpgmac0";
8167
cpdma_channels = <8>;
82-
host_port_no = <0>;
83-
cpdma_reg_ofs = <0x800>;
84-
cpdma_sram_ofs = <0xa00>;
85-
ale_reg_ofs = <0xd00>;
8668
ale_entries = <1024>;
87-
host_port_reg_ofs = <0x108>;
88-
hw_stats_reg_ofs = <0x900>;
89-
bd_ram_ofs = <0x2000>;
9069
bd_ram_size = <0x2000>;
9170
no_bd_ram = <0>;
9271
rx_descs = <64>;
9372
mac_control = <0x20>;
9473
slaves = <2>;
74+
cpts_active_slave = <0>;
75+
cpts_clock_mult = <0x80000000>;
76+
cpts_clock_shift = <29>;
9577
cpsw_emac0: slave@0 {
96-
slave_reg_ofs = <0x208>;
97-
sliver_reg_ofs = <0xd80>;
98-
phy_id = "davinci_mdio.16:00";
78+
phy_id = <&davinci_mdio>, <0>;
9979
/* Filled in by U-Boot */
10080
mac-address = [ 00 00 00 00 00 00 ];
10181
};
10282
cpsw_emac1: slave@1 {
103-
slave_reg_ofs = <0x308>;
104-
sliver_reg_ofs = <0xdc0>;
105-
phy_id = "davinci_mdio.16:01";
83+
phy_id = <&davinci_mdio>, <1>;
10684
/* Filled in by U-Boot */
10785
mac-address = [ 00 00 00 00 00 00 ];
10886
};

‎Documentation/kernel-parameters.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,24 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
905905
gpt [EFI] Forces disk with valid GPT signature but
906906
invalid Protective MBR to be treated as GPT.
907907

908+
grcan.enable0= [HW] Configuration of physical interface 0. Determines
909+
the "Enable 0" bit of the configuration register.
910+
Format: 0 | 1
911+
Default: 0
912+
grcan.enable1= [HW] Configuration of physical interface 1. Determines
913+
the "Enable 0" bit of the configuration register.
914+
Format: 0 | 1
915+
Default: 0
916+
grcan.select= [HW] Select which physical interface to use.
917+
Format: 0 | 1
918+
Default: 0
919+
grcan.txsize= [HW] Sets the size of the tx buffer.
920+
Format: <unsigned int> such that (txsize & ~0x1fffc0) == 0.
921+
Default: 1024
922+
grcan.rxsize= [HW] Sets the size of the rx buffer.
923+
Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
924+
Default: 1024
925+
908926
hashdist= [KNL,NUMA] Large hashes allocated during boot
909927
are distributed across NUMA nodes. Defaults on
910928
for 64-bit NUMA, off otherwise.

‎Documentation/networking/batman-adv.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ abled during run time. Following log_levels are defined:
203203
2 - Enable messages related to route added / changed / deleted
204204
4 - Enable messages related to translation table operations
205205
8 - Enable messages related to bridge loop avoidance
206-
15 - enable all messages
206+
16 - Enable messaged related to DAT, ARP snooping and parsing
207+
31 - Enable all messages
207208

208209
The debug output can be changed at runtime using the file
209210
/sys/class/net/bat0/mesh/log_level. e.g.

0 commit comments

Comments
 (0)