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

Commit 9c5d1bc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) MODULE_FIRMWARE firmware string not correct for iwlwifi 8000 chips,
    from Sara Sharon.

 2) Fix SKB size checks in batman-adv stack on receive, from Sven
    Eckelmann.

 3) Leak fix on mac80211 interface add error paths, from Johannes Berg.

 4) Cannot invoke napi_disable() with BH disabled in myri10ge driver,
    fix from Stanislaw Gruszka.

 5) Fix sign extension problem when computing feature masks in
    net_gso_ok(), from Marcelo Ricardo Leitner.

 6) lan78xx driver doesn't count packets and packet lengths in its
    statistics properly, fix from Woojung Huh.

 7) Fix the buffer allocation sizes in pegasus USB driver, from Petko
    Manolov.

 8) Fix refcount overflows in bpf, from Alexei Starovoitov.

 9) Unified dst cache handling introduced a preempt warning in
    ip_tunnel, fix by resetting rather then setting the cached route.
    From Paolo Abeni.

10) Listener hash collision test fix in soreuseport, from Craig Gallak

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
  gre: do not pull header in ICMP error processing
  net: Implement net_dbg_ratelimited() for CONFIG_DYNAMIC_DEBUG case
  tipc: only process unicast on intended node
  cxgb3: fix out of bounds read
  net/smscx5xx: use the device tree for mac address
  soreuseport: Fix TCP listener hash collision
  net: l2tp: fix reversed udp6 checksum flags
  ip_tunnel: fix preempt warning in ip tunnel creation/updating
  samples/bpf: fix trace_output example
  bpf: fix check_map_func_compatibility logic
  bpf: fix refcnt overflow
  drivers: net: cpsw: use of_phy_connect() in fixed-link case
  dt: cpsw: phy-handle, phy_id, and fixed-link are mutually exclusive
  drivers: net: cpsw: don't ignore phy-mode if phy-handle is used
  drivers: net: cpsw: fix segfault in case of bad phy-handle
  drivers: net: cpsw: fix parsing of phy-handle DT property in dual_emac config
  MAINTAINERS: net: Change maintainer for GRETH 10/100/1G Ethernet MAC device driver
  gre: reject GUE and FOU in collect metadata mode
  pegasus: fixes reported packet length
  pegasus: fixes URB buffer allocation size;
  ...
parents ba22906a b7f8fe25

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ Required properties: 
Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy_id		: Specifies slave phy id (deprecated, use phy-handle)

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: Exactly one of phy_id, phy-handle, or fixed-link must be specified.



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

Documentation/networking/altera_tse.txt

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ This is the driver for the Altera Triple-Speed Ethernet (TSE) controllers 
using the SGDMA and MSGDMA soft DMA IP components. The driver uses the

platform bus to obtain component resources. The designs used to test this

driver were built for a Cyclone(R) V SOC FPGA board, a Cyclone(R) V FPGA board,

and tested with ARM and NIOS processor hosts seperately. The anticipated use

and tested with ARM and NIOS processor hosts separately. The anticipated use

cases are simple communications between an embedded system and an external peer

for status and simple configuration of the embedded system.
@@ -65,14 +65,14 @@ Driver parameters can be also passed in command line by using: 
4.1) Transmit process

When the driver's transmit routine is called by the kernel, it sets up a

transmit descriptor by calling the underlying DMA transmit routine (SGDMA or

MSGDMA), and initites a transmit operation. Once the transmit is complete, an

MSGDMA), and initiates a transmit operation. Once the transmit is complete, an

interrupt is driven by the transmit DMA logic. The driver handles the transmit

completion in the context of the interrupt handling chain by recycling

resource required to send and track the requested transmit operation.



4.2) Receive process

The driver will post receive buffers to the receive DMA logic during driver

intialization. Receive buffers may or may not be queued depending upon the

initialization. Receive buffers may or may not be queued depending upon the

underlying DMA logic (MSGDMA is able queue receive buffers, SGDMA is not able

to queue receive buffers to the SGDMA receive logic). When a packet is

received, the DMA logic generates an interrupt. The driver handles a receive

Documentation/networking/ipvlan.txt

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Initial Release: 
	This is conceptually very similar to the macvlan driver with one major

exception of using L3 for mux-ing /demux-ing among slaves. This property makes

the master device share the L2 with it's slave devices. I have developed this

driver in conjuntion with network namespaces and not sure if there is use case

driver in conjunction with network namespaces and not sure if there is use case

outside of it.
@@ -56,7 +56,7 @@ situations defines your use case then you can choose to use ipvlan - 
	(a) The Linux host that is connected to the external switch / router has

policy configured that allows only one mac per port.

	(b) No of virtual devices created on a master exceed the mac capacity and

puts the NIC in promiscous mode and degraded performance is a concern.

puts the NIC in promiscuous mode and degraded performance is a concern.

	(c) If the slave device is to be put into the hostile / untrusted network

namespace where L2 on the slave could be changed / misused.

Documentation/networking/pktgen.txt

+3 −3
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ The two basic thread commands are: 
 * add_device DEVICE@NAME -- adds a single device

 * rem_device_all         -- remove all associated devices



When adding a device to a thread, a corrosponding procfile is created

When adding a device to a thread, a corresponding procfile is created

which is used for configuring this device. Thus, device names need to

be unique.



To support adding the same device to multiple threads, which is useful

with multi queue NICs, a the device naming scheme is extended with "@":

with multi queue NICs, the device naming scheme is extended with "@":

 device@something



The part after "@" can be anything, but it is custom to use the thread
@@ -221,7 +221,7 @@ Sample scripts 


A collection of tutorial scripts and helpers for pktgen is in the

samples/pktgen directory. The helper parameters.sh file support easy

and consistant parameter parsing across the sample scripts.

and consistent parameter parsing across the sample scripts.



Usage example and help:

 ./pktgen_sample01_simple.sh -i eth4 -m 00:1B:21:3C:9D:F8 -d 192.168.8.2

Documentation/networking/vrf.txt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ using an rx_handler which gives the impression that packets flow through 
the VRF device. Similarly on egress routing rules are used to send packets

to the VRF device driver before getting sent out the actual interface. This

allows tcpdump on a VRF device to capture all packets into and out of the

VRF as a whole.[1] Similiarly, netfilter [2] and tc rules can be applied

VRF as a whole.[1] Similarly, netfilter [2] and tc rules can be applied

using the VRF device to specify rules that apply to the VRF domain as a whole.



[1] Packets in the forwarded state do not flow through the device, so those