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

Commit 6f0d349d 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) Fix netpoll OOPS in r8169, from Ville Syrjälä.

 2) Fix bpf instruction alignment on powerpc et al., from Eric Dumazet.

 3) Don't ignore IFLA_MTU attribute when creating new ipvlan links. From
    Xin Long.

 4) Fix use after free in AF_PACKET, from Eric Dumazet.

 5) Mis-matched RTNL unlock in xen-netfront, from Ross Lagerwall.

 6) Fix VSOCK loopback on big-endian, from Claudio Imbrenda.

 7) Missing RX buffer offset correction when computing DMA addresses in
    mvneta driver, from Antoine Tenart.

 8) Fix crashes in DCCP's ccid3_hc_rx_send_feedback, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
  sfc: make function efx_rps_hash_bucket static
  strparser: Corrected typo in documentation.
  qmi_wwan: add support for the Dell Wireless 5821e module
  cxgb4: when disabling dcb set txq dcb priority to 0
  net_sched: remove a bogus warning in hfsc
  net: dccp: switch rx_tstamp_last_feedback to monotonic clock
  net: dccp: avoid crash in ccid3_hc_rx_send_feedback()
  net: Remove depends on HAS_DMA in case of platform dependency
  MAINTAINERS: Add file patterns for dsa device tree bindings
  net: mscc: make sparse happy
  net: mvneta: fix the Rx desc DMA address in the Rx path
  Documentation: e1000: Fix docs build error
  Documentation: e100: Fix docs build error
  Documentation: e1000: Use correct heading adornment
  Documentation: e100: Use correct heading adornment
  ipv6: mcast: fix unsolicited report interval after receiving querys
  vhost_net: validate sock before trying to put its fd
  VSOCK: fix loopback on big-endian systems
  net: ethernet: ti: davinci_cpdma: make function cpdma_desc_pool_create static
  xen-netfront: Update features after registering netdev
  ...
parents 7daf201d 829eb053

Documentation/networking/e100.rst

+57 −55
Original line number Original line Diff line number Diff line 
==============================================================

Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters

Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters

==============================================================

==============================================================
@@ -89,27 +90,30 @@ Additional Configurations 
Configuring the Driver on Different Distributions

Configuring the Driver on Different Distributions

-------------------------------------------------

-------------------------------------------------





  Configuring a network driver to load properly when the system is started is

Configuring a network driver to load properly when the system is started

  distribution dependent. Typically, the configuration process involves adding

is distribution dependent.  Typically, the configuration process involves

  an alias line to /etc/modprobe.d/*.conf as well as editing other system

adding an alias line to /etc/modprobe.d/*.conf as well as editing other

  startup scripts and/or configuration files.  Many popular Linux

system startup scripts and/or configuration files.  Many popular Linux

  distributions ship with tools to make these changes for you. To learn the

distributions ship with tools to make these changes for you.  To learn

  proper way to configure a network device for your system, refer to your

the proper way to configure a network device for your system, refer to

  distribution documentation.  If during this process you are asked for the

your distribution documentation.  If during this process you are asked

  driver or module name, the name for the Linux Base Driver for the Intel

for the driver or module name, the name for the Linux Base Driver for

  PRO/100 Family of Adapters is e100.

the Intel PRO/100 Family of Adapters is e100.





As an example, if you install the e100 driver for two PRO/100 adapters

As an example, if you install the e100 driver for two PRO/100 adapters

  (eth0 and eth1), add the following to a configuration file in /etc/modprobe.d/

(eth0 and eth1), add the following to a configuration file in

/etc/modprobe.d/::





       alias eth0 e100

       alias eth0 e100

       alias eth1 e100

       alias eth1 e100





Viewing Link Messages

Viewing Link Messages

---------------------

---------------------



In order to see link messages and other Intel driver information on your

In order to see link messages and other Intel driver information on your

console, you must set the dmesg level up to six.  This can be done by

console, you must set the dmesg level up to six.  This can be done by

  entering the following on the command line before loading the e100 driver::

entering the following on the command line before loading the e100

driver::





       dmesg -n 6

       dmesg -n 6
@@ -118,7 +122,6 @@ Additional Configurations 




NOTE: This setting is not saved across reboots.

NOTE: This setting is not saved across reboots.







ethtool

ethtool

-------

-------
@@ -131,26 +134,25 @@ Additional Configurations 




Enabling Wake on LAN* (WoL)

Enabling Wake on LAN* (WoL)

---------------------------

---------------------------

  WoL is provided through the ethtool* utility.  For instructions on enabling

WoL is provided through the ethtool* utility.  For instructions on

  WoL with ethtool, refer to the ethtool man page.

enabling WoL with ethtool, refer to the ethtool man page.  WoL will be



enabled on the system during the next shut down or reboot.  For this

  WoL will be enabled on the system during the next shut down or reboot. For

driver version, in order to enable WoL, the e100 driver must be loaded

  this driver version, in order to enable WoL, the e100 driver must be

when shutting down or rebooting the system.

  loaded when shutting down or rebooting the system.





NAPI

NAPI

----

----





NAPI (Rx polling mode) is supported in the e100 driver.

NAPI (Rx polling mode) is supported in the e100 driver.





  See https://wiki.linuxfoundation.org/networking/napi for more information

See https://wiki.linuxfoundation.org/networking/napi for more

  on NAPI.

information on NAPI.





Multiple Interfaces on Same Ethernet Broadcast Network

Multiple Interfaces on Same Ethernet Broadcast Network

------------------------------------------------------

------------------------------------------------------





  Due to the default ARP behavior on Linux, it is not possible to have

Due to the default ARP behavior on Linux, it is not possible to have one

  one system on two IP networks in the same Ethernet broadcast domain

system on two IP networks in the same Ethernet broadcast domain

(non-partitioned switch) behave as expected.  All Ethernet interfaces

(non-partitioned switch) behave as expected.  All Ethernet interfaces

will respond to IP traffic for any IP address assigned to the system.

will respond to IP traffic for any IP address assigned to the system.

This results in unbalanced receive traffic.

This results in unbalanced receive traffic.

Documentation/networking/e1000.rst

+39 −37
Original line number Original line Diff line number Diff line 
===========================================================

Linux* Base Driver for Intel(R) Ethernet Network Connection

Linux* Base Driver for Intel(R) Ethernet Network Connection

===========================================================

===========================================================
@@ -356,9 +357,9 @@ Additional Configurations 




Jumbo Frames

Jumbo Frames

------------

------------

  Jumbo Frames support is enabled by changing the MTU to a value larger than

Jumbo Frames support is enabled by changing the MTU to a value larger

  the default of 1500.  Use the ifconfig command to increase the MTU size.

than the default of 1500.  Use the ifconfig command to increase the MTU

  For example::

size.  For example::





       ifconfig eth<x> mtu 9000 up

       ifconfig eth<x> mtu 9000 up
@@ -371,23 +372,23 @@ Additional Configurations 
applies to the Red Hat distributions; other distributions may store this

applies to the Red Hat distributions; other distributions may store this

setting in a different location.

setting in a different location.





  Notes:

Notes: Degradation in throughput performance may be observed in some

  Degradation in throughput performance may be observed in some Jumbo frames

Jumbo frames environments.  If this is observed, increasing the

  environments. If this is observed, increasing the application's socket buffer

application's socket buffer size and/or increasing the

  size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.

/proc/sys/net/ipv4/tcp_*mem entry values may help.  See the specific

  See the specific application manual and /usr/src/linux*/Documentation/

application manual and /usr/src/linux*/Documentation/

networking/ip-sysctl.txt for more details.

networking/ip-sysctl.txt for more details.





  - The maximum MTU setting for Jumbo Frames is 16110.  This value coincides

- The maximum MTU setting for Jumbo Frames is 16110.  This value

    with the maximum Jumbo Frames size of 16128.

  coincides with the maximum Jumbo Frames size of 16128.





  - Using Jumbo frames at 10 or 100 Mbps is not supported and may result in

- Using Jumbo frames at 10 or 100 Mbps is not supported and may result

    poor performance or loss of link.

  in poor performance or loss of link.





- Adapters based on the Intel(R) 82542 and 82573V/E controller do not

- Adapters based on the Intel(R) 82542 and 82573V/E controller do not

  support Jumbo Frames.  These correspond to the following product names:

  support Jumbo Frames.  These correspond to the following product names:

     Intel(R) PRO/1000 Gigabit Server Adapter

  Intel(R) PRO/1000 Gigabit Server Adapter Intel(R) PRO/1000 PM Network

     Intel(R) PRO/1000 PM Network Connection

  Connection





ethtool

ethtool

-------

-------
@@ -406,6 +407,7 @@ Additional Configurations 
For this driver version, in order to enable WoL, the e1000 driver must be

For this driver version, in order to enable WoL, the e1000 driver must be

loaded when shutting down or rebooting the system.

loaded when shutting down or rebooting the system.







Support

Support

=======

=======

Documentation/networking/strparser.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ void strp_pause(struct strparser *strp) 
     Temporarily pause a stream parser. Message parsing is suspended

     Temporarily pause a stream parser. Message parsing is suspended

     and no new messages are delivered to the upper layer.

     and no new messages are delivered to the upper layer.





void strp_pause(struct strparser *strp)

void strp_unpause(struct strparser *strp)





     Unpause a paused stream parser.

     Unpause a paused stream parser.

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -9882,6 +9882,7 @@ M: Andrew Lunn <andrew@lunn.ch> 
M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

S:	Maintained

S:	Maintained

F:	Documentation/devicetree/bindings/net/dsa/

F:	net/dsa/

F:	net/dsa/

F:	include/net/dsa.h

F:	include/net/dsa.h

F:	include/linux/dsa/

F:	include/linux/dsa/

drivers/net/ethernet/amd/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ config SUNLANCE 




config AMD_XGBE

config AMD_XGBE

	tristate "AMD 10GbE Ethernet driver"

	tristate "AMD 10GbE Ethernet driver"

	depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA

	depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM

	depends on X86 || ARM64 || COMPILE_TEST

	depends on X86 || ARM64 || COMPILE_TEST

	select BITREVERSE

	select BITREVERSE

	select CRC32

	select CRC32