Skip to content

Commit 6f0d349

Browse files
torvaldstorvalds
committed
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 ...
2 parents 7daf201 + 829eb05 commit 6f0d349

File tree

40 files changed

+190
-165
lines changed

40 files changed

+190
-165
lines changed

‎Documentation/networking/e100.rst

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
==============================================================
12
Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters
23
==============================================================
34

@@ -86,83 +87,84 @@ Event Log Message Level: The driver uses the message level flag to log events
8687
Additional Configurations
8788
=========================
8889

89-
Configuring the Driver on Different Distributions
90-
-------------------------------------------------
90+
Configuring the Driver on Different Distributions
91+
-------------------------------------------------
9192

92-
Configuring a network driver to load properly when the system is started is
93-
distribution dependent. Typically, the configuration process involves adding
94-
an alias line to /etc/modprobe.d/*.conf as well as editing other system
95-
startup scripts and/or configuration files. Many popular Linux
96-
distributions ship with tools to make these changes for you. To learn the
97-
proper way to configure a network device for your system, refer to your
98-
distribution documentation. If during this process you are asked for the
99-
driver or module name, the name for the Linux Base Driver for the Intel
100-
PRO/100 Family of Adapters is e100.
93+
Configuring a network driver to load properly when the system is started
94+
is distribution dependent. Typically, the configuration process involves
95+
adding an alias line to /etc/modprobe.d/*.conf as well as editing other
96+
system startup scripts and/or configuration files. Many popular Linux
97+
distributions ship with tools to make these changes for you. To learn
98+
the proper way to configure a network device for your system, refer to
99+
your distribution documentation. If during this process you are asked
100+
for the driver or module name, the name for the Linux Base Driver for
101+
the Intel PRO/100 Family of Adapters is e100.
101102
102-
As an example, if you install the e100 driver for two PRO/100 adapters
103-
(eth0 and eth1), add the following to a configuration file in /etc/modprobe.d/
103+
As an example, if you install the e100 driver for two PRO/100 adapters
104+
(eth0 and eth1), add the following to a configuration file in
105+
/etc/modprobe.d/::
104106

105107
alias eth0 e100
106108
alias eth1 e100
107109

108-
Viewing Link Messages
109-
---------------------
110-
In order to see link messages and other Intel driver information on your
111-
console, you must set the dmesg level up to six. This can be done by
112-
entering the following on the command line before loading the e100 driver::
113-
114-
dmesg -n 6
110+
Viewing Link Messages
111+
---------------------
115112

116-
If you wish to see all messages issued by the driver, including debug
117-
messages, set the dmesg level to eight.
113+
In order to see link messages and other Intel driver information on your
114+
console, you must set the dmesg level up to six. This can be done by
115+
entering the following on the command line before loading the e100
116+
driver::
118117

119-
NOTE: This setting is not saved across reboots.
118+
dmesg -n 6
120119

120+
If you wish to see all messages issued by the driver, including debug
121+
messages, set the dmesg level to eight.
121122

122-
ethtool
123-
-------
123+
NOTE: This setting is not saved across reboots.
124124

125-
The driver utilizes the ethtool interface for driver configuration and
126-
diagnostics, as well as displaying statistical information. The ethtool
127-
version 1.6 or later is required for this functionality.
125+
ethtool
126+
-------
128127

129-
The latest release of ethtool can be found from
130-
https://www.kernel.org/pub/software/network/ethtool/
128+
The driver utilizes the ethtool interface for driver configuration and
129+
diagnostics, as well as displaying statistical information. The ethtool
130+
version 1.6 or later is required for this functionality.
131131

132-
Enabling Wake on LAN* (WoL)
133-
---------------------------
134-
WoL is provided through the ethtool* utility. For instructions on enabling
135-
WoL with ethtool, refer to the ethtool man page.
132+
The latest release of ethtool can be found from
133+
https://www.kernel.org/pub/software/network/ethtool/
136134

137-
WoL will be enabled on the system during the next shut down or reboot. For
138-
this driver version, in order to enable WoL, the e100 driver must be
139-
loaded when shutting down or rebooting the system.
135+
Enabling Wake on LAN* (WoL)
136+
---------------------------
137+
WoL is provided through the ethtool* utility. For instructions on
138+
enabling WoL with ethtool, refer to the ethtool man page. WoL will be
139+
enabled on the system during the next shut down or reboot. For this
140+
driver version, in order to enable WoL, the e100 driver must be loaded
141+
when shutting down or rebooting the system.
140142

141-
NAPI
142-
----
143+
NAPI
144+
----
143145

144-
NAPI (Rx polling mode) is supported in the e100 driver.
146+
NAPI (Rx polling mode) is supported in the e100 driver.
145147

146-
See https://wiki.linuxfoundation.org/networking/napi for more information
147-
on NAPI.
148+
See https://wiki.linuxfoundation.org/networking/napi for more
149+
information on NAPI.
148150

149-
Multiple Interfaces on Same Ethernet Broadcast Network
150-
------------------------------------------------------
151+
Multiple Interfaces on Same Ethernet Broadcast Network
152+
------------------------------------------------------
151153

152-
Due to the default ARP behavior on Linux, it is not possible to have
153-
one system on two IP networks in the same Ethernet broadcast domain
154-
(non-partitioned switch) behave as expected. All Ethernet interfaces
155-
will respond to IP traffic for any IP address assigned to the system.
156-
This results in unbalanced receive traffic.
154+
Due to the default ARP behavior on Linux, it is not possible to have one
155+
system on two IP networks in the same Ethernet broadcast domain
156+
(non-partitioned switch) behave as expected. All Ethernet interfaces
157+
will respond to IP traffic for any IP address assigned to the system.
158+
This results in unbalanced receive traffic.
157159

158-
If you have multiple interfaces in a server, either turn on ARP
159-
filtering by
160+
If you have multiple interfaces in a server, either turn on ARP
161+
filtering by
160162

161-
(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
162-
(this only works if your kernel's version is higher than 2.4.5), or
163+
(1) entering:: echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
164+
(this only works if your kernel's version is higher than 2.4.5), or
163165

164-
(2) installing the interfaces in separate broadcast domains (either
165-
in different switches or in a switch partitioned to VLANs).
166+
(2) installing the interfaces in separate broadcast domains (either
167+
in different switches or in a switch partitioned to VLANs).
166168

167169

168170
Support

‎Documentation/networking/e1000.rst

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
===========================================================
12
Linux* Base Driver for Intel(R) Ethernet Network Connection
23
===========================================================
34

@@ -354,57 +355,58 @@ previously mentioned to force the adapter to the same speed and duplex.
354355
Additional Configurations
355356
=========================
356357

357-
Jumbo Frames
358-
------------
359-
Jumbo Frames support is enabled by changing the MTU to a value larger than
360-
the default of 1500. Use the ifconfig command to increase the MTU size.
361-
For example::
358+
Jumbo Frames
359+
------------
360+
Jumbo Frames support is enabled by changing the MTU to a value larger
361+
than the default of 1500. Use the ifconfig command to increase the MTU
362+
size. For example::
362363

363364
ifconfig eth<x> mtu 9000 up
364365

365-
This setting is not saved across reboots. It can be made permanent if
366-
you add::
366+
This setting is not saved across reboots. It can be made permanent if
367+
you add::
367368

368369
MTU=9000
369370

370-
to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example
371-
applies to the Red Hat distributions; other distributions may store this
372-
setting in a different location.
371+
to the file /etc/sysconfig/network-scripts/ifcfg-eth<x>. This example
372+
applies to the Red Hat distributions; other distributions may store this
373+
setting in a different location.
374+
375+
Notes: Degradation in throughput performance may be observed in some
376+
Jumbo frames environments. If this is observed, increasing the
377+
application's socket buffer size and/or increasing the
378+
/proc/sys/net/ipv4/tcp_*mem entry values may help. See the specific
379+
application manual and /usr/src/linux*/Documentation/
380+
networking/ip-sysctl.txt for more details.
373381

374-
Notes:
375-
Degradation in throughput performance may be observed in some Jumbo frames
376-
environments. If this is observed, increasing the application's socket buffer
377-
size and/or increasing the /proc/sys/net/ipv4/tcp_*mem entry values may help.
378-
See the specific application manual and /usr/src/linux*/Documentation/
379-
networking/ip-sysctl.txt for more details.
382+
- The maximum MTU setting for Jumbo Frames is 16110. This value
383+
coincides with the maximum Jumbo Frames size of 16128.
380384

381-
- The maximum MTU setting for Jumbo Frames is 16110. This value coincides
382-
with the maximum Jumbo Frames size of 16128.
385+
- Using Jumbo frames at 10 or 100 Mbps is not supported and may result
386+
in poor performance or loss of link.
383387

384-
- Using Jumbo frames at 10 or 100 Mbps is not supported and may result in
385-
poor performance or loss of link.
388+
- Adapters based on the Intel(R) 82542 and 82573V/E controller do not
389+
support Jumbo Frames. These correspond to the following product names:
390+
Intel(R) PRO/1000 Gigabit Server Adapter Intel(R) PRO/1000 PM Network
391+
Connection
386392

387-
- Adapters based on the Intel(R) 82542 and 82573V/E controller do not
388-
support Jumbo Frames. These correspond to the following product names:
389-
Intel(R) PRO/1000 Gigabit Server Adapter
390-
Intel(R) PRO/1000 PM Network Connection
393+
ethtool
394+
-------
395+
The driver utilizes the ethtool interface for driver configuration and
396+
diagnostics, as well as displaying statistical information. The ethtool
397+
version 1.6 or later is required for this functionality.
391398

392-
ethtool
393-
-------
394-
The driver utilizes the ethtool interface for driver configuration and
395-
diagnostics, as well as displaying statistical information. The ethtool
396-
version 1.6 or later is required for this functionality.
399+
The latest release of ethtool can be found from
400+
https://www.kernel.org/pub/software/network/ethtool/
397401

398-
The latest release of ethtool can be found from
399-
https://www.kernel.org/pub/software/network/ethtool/
402+
Enabling Wake on LAN* (WoL)
403+
---------------------------
404+
WoL is configured through the ethtool* utility.
400405

401-
Enabling Wake on LAN* (WoL)
402-
---------------------------
403-
WoL is configured through the ethtool* utility.
406+
WoL will be enabled on the system during the next shut down or reboot.
407+
For this driver version, in order to enable WoL, the e1000 driver must be
408+
loaded when shutting down or rebooting the system.
404409

405-
WoL will be enabled on the system during the next shut down or reboot.
406-
For this driver version, in order to enable WoL, the e1000 driver must be
407-
loaded when shutting down or rebooting the system.
408410

409411
Support
410412
=======

‎Documentation/networking/strparser.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void strp_pause(struct strparser *strp)
4848
Temporarily pause a stream parser. Message parsing is suspended
4949
and no new messages are delivered to the upper layer.
5050

51-
void strp_pause(struct strparser *strp)
51+
void strp_unpause(struct strparser *strp)
5252

5353
Unpause a paused stream parser.
5454

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9882,6 +9882,7 @@ M: Andrew Lunn <andrew@lunn.ch>
98829882
M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
98839883
M: Florian Fainelli <f.fainelli@gmail.com>
98849884
S: Maintained
9885+
F: Documentation/devicetree/bindings/net/dsa/
98859886
F: net/dsa/
98869887
F: include/net/dsa.h
98879888
F: include/linux/dsa/

‎drivers/net/ethernet/amd/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ config SUNLANCE
173173

174174
config AMD_XGBE
175175
tristate "AMD 10GbE Ethernet driver"
176-
depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA
176+
depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM
177177
depends on X86 || ARM64 || COMPILE_TEST
178178
select BITREVERSE
179179
select CRC32

‎drivers/net/ethernet/apm/xgene-v2/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
config NET_XGENE_V2
22
tristate "APM X-Gene SoC Ethernet-v2 Driver"
3-
depends on HAS_DMA
43
depends on ARCH_XGENE || COMPILE_TEST
54
help
65
This is the Ethernet driver for the on-chip ethernet interface

‎drivers/net/ethernet/apm/xgene/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
config NET_XGENE
22
tristate "APM X-Gene SoC Ethernet Driver"
3-
depends on HAS_DMA
43
depends on ARCH_XGENE || COMPILE_TEST
54
select PHYLIB
65
select MDIO_XGENE

‎drivers/net/ethernet/arc/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ config ARC_EMAC_CORE
2424
config ARC_EMAC
2525
tristate "ARC EMAC support"
2626
select ARC_EMAC_CORE
27-
depends on OF_IRQ && OF_NET && HAS_DMA && (ARC || COMPILE_TEST)
27+
depends on OF_IRQ && OF_NET
28+
depends on ARC || COMPILE_TEST
2829
---help---
2930
On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
3031
non-standard on-chip ethernet device ARC EMAC 10/100 is used.
@@ -33,7 +34,8 @@ config ARC_EMAC
3334
config EMAC_ROCKCHIP
3435
tristate "Rockchip EMAC support"
3536
select ARC_EMAC_CORE
36-
depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA && (ARCH_ROCKCHIP || COMPILE_TEST)
37+
depends on OF_IRQ && OF_NET && REGULATOR
38+
depends on ARCH_ROCKCHIP || COMPILE_TEST
3739
---help---
3840
Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.
3941
This selects Rockchip SoC glue layer support for the

‎drivers/net/ethernet/broadcom/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ config BGMAC
157157
config BGMAC_BCMA
158158
tristate "Broadcom iProc GBit BCMA support"
159159
depends on BCMA && BCMA_HOST_SOC
160-
depends on HAS_DMA
161160
depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST
162161
select BGMAC
163162
select PHYLIB
@@ -170,7 +169,6 @@ config BGMAC_BCMA
170169

171170
config BGMAC_PLATFORM
172171
tristate "Broadcom iProc GBit platform support"
173-
depends on HAS_DMA
174172
depends on ARCH_BCM_IPROC || COMPILE_TEST
175173
depends on OF
176174
select BGMAC

‎drivers/net/ethernet/cadence/macb_ptp.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
170170

171171
if (delta > TSU_NSEC_MAX_VAL) {
172172
gem_tsu_get_time(&bp->ptp_clock_info, &now);
173-
if (sign)
174-
now = timespec64_sub(now, then);
175-
else
176-
now = timespec64_add(now, then);
173+
now = timespec64_add(now, then);
177174

178175
gem_tsu_set_time(&bp->ptp_clock_info,
179176
(const struct timespec64 *)&now);

‎drivers/net/ethernet/calxeda/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config NET_CALXEDA_XGMAC
22
tristate "Calxeda 1G/10G XGMAC Ethernet driver"
3-
depends on HAS_IOMEM && HAS_DMA
3+
depends on HAS_IOMEM
44
depends on ARCH_HIGHBANK || COMPILE_TEST
55
select CRC32
66
help

‎drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable)
263263
"Can't %s DCB Priority on port %d, TX Queue %d: err=%d\n",
264264
enable ? "set" : "unset", pi->port_id, i, -err);
265265
else
266-
txq->dcb_prio = value;
266+
txq->dcb_prio = enable ? value : 0;
267267
}
268268
}
269269

‎drivers/net/ethernet/hisilicon/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
config NET_VENDOR_HISILICON
66
bool "Hisilicon devices"
77
default y
8-
depends on (OF || ACPI) && HAS_DMA
8+
depends on OF || ACPI
99
depends on ARM || ARM64 || COMPILE_TEST
1010
---help---
1111
If you have a network (Ethernet) card belonging to this class, say Y.

‎drivers/net/ethernet/marvell/Kconfig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ if NET_VENDOR_MARVELL
1818

1919
config MV643XX_ETH
2020
tristate "Marvell Discovery (643XX) and Orion ethernet support"
21-
depends on (MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST) && INET
22-
depends on HAS_DMA
21+
depends on MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST
22+
depends on INET
2323
select PHYLIB
2424
select MVMDIO
2525
---help---
@@ -58,7 +58,6 @@ config MVNETA_BM_ENABLE
5858
config MVNETA
5959
tristate "Marvell Armada 370/38x/XP/37xx network interface support"
6060
depends on ARCH_MVEBU || COMPILE_TEST
61-
depends on HAS_DMA
6261
select MVMDIO
6362
select PHYLINK
6463
---help---
@@ -84,7 +83,6 @@ config MVNETA_BM
8483
config MVPP2
8584
tristate "Marvell Armada 375/7K/8K network interface support"
8685
depends on ARCH_MVEBU || COMPILE_TEST
87-
depends on HAS_DMA
8886
select MVMDIO
8987
select PHYLINK
9088
---help---
@@ -93,7 +91,7 @@ config MVPP2
9391

9492
config PXA168_ETH
9593
tristate "Marvell pxa168 ethernet support"
96-
depends on HAS_IOMEM && HAS_DMA
94+
depends on HAS_IOMEM
9795
depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST
9896
select PHYLIB
9997
---help---

0 commit comments

Comments
 (0)