Skip to content

Commit 036e343

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) Fix OOPS during nf_tables rule dump, from Florian Westphal. 2) Use after free in ip_vs_in, from Yue Haibing. 3) Fix various kTLS bugs (NULL deref during device removal resync, netdev notification ignoring, etc.) From Jakub Kicinski. 4) Fix ipv6 redirects with VRF, from David Ahern. 5) Memory leak fix in igmpv3_del_delrec(), from Eric Dumazet. 6) Missing memory allocation failure check in ip6_ra_control(), from Gen Zhang. And likewise fix ip_ra_control(). 7) TX clean budget logic error in aquantia, from Igor Russkikh. 8) SKB leak in llc_build_and_send_ui_pkt(), from Eric Dumazet. 9) Double frees in mlx5, from Parav Pandit. 10) Fix lost MAC address in r8169 during PCI D3, from Heiner Kallweit. 11) Fix botched register access in mvpp2, from Antoine Tenart. 12) Use after free in napi_gro_frags(), from Eric Dumazet. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (89 commits) net: correct zerocopy refcnt with udp MSG_MORE ethtool: Check for vlan etype or vlan tci when parsing flow_rule net: don't clear sock->sk early to avoid trouble in strparser net-gro: fix use-after-free read in napi_gro_frags() net: dsa: tag_8021q: Create a stable binary format net: dsa: tag_8021q: Change order of rx_vid setup net: mvpp2: fix bad MVPP2_TXQ_SCHED_TOKEN_CNTR_REG queue value ipv4: tcp_input: fix stack out of bounds when parsing TCP options. mlxsw: spectrum: Prevent force of 56G mlxsw: spectrum_acl: Avoid warning after identical rules insertion net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT r8169: fix MAC address being lost in PCI D3 net: core: support XDP generic on stacked devices. netvsc: unshare skb in VF rx handler udp: Avoid post-GRO UDP checksum recalculation net: phy: dp83867: Set up RGMII TX delay net: phy: dp83867: do not call config_init twice net: phy: dp83867: increase SGMII autoneg timer duration net: phy: dp83867: fix speed 10 in sgmii mode net: phy: marvell10g: report if the PHY fails to boot firmware ...
2 parents adc3f55 + 100f6d8 commit 036e343

Some content is hidden

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

87 files changed

+1765
-680
lines changed

Documentation/ABI/testing/sysfs-bus-mdio

Lines changed: 0 additions & 29 deletions
This file was deleted.

Documentation/ABI/testing/sysfs-class-net-phydev

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,31 @@ Date: February 2014
1111
KernelVersion: 3.15
1212
1313
Description:
14-
Boolean value indicating whether the PHY device has
15-
any fixups registered against it (phy_register_fixup)
14+
This attribute contains the boolean value whether a given PHY
15+
device has had any "fixup" workaround running on it, encoded as
16+
a boolean. This information is provided to help troubleshooting
17+
PHY configurations.
1618

1719
What: /sys/class/mdio_bus/<bus>/<device>/phy_id
1820
Date: November 2012
1921
KernelVersion: 3.8
2022
2123
Description:
22-
32-bit hexadecimal value corresponding to the PHY device's OUI,
23-
model and revision number.
24+
This attribute contains the 32-bit PHY Identifier as reported
25+
by the device during bus enumeration, encoded in hexadecimal.
26+
This ID is used to match the device with the appropriate
27+
driver.
2428

2529
What: /sys/class/mdio_bus/<bus>/<device>/phy_interface
2630
Date: February 2014
2731
KernelVersion: 3.15
2832
2933
Description:
30-
String value indicating the PHY interface, possible
31-
values are:.
34+
This attribute contains the PHY interface as configured by the
35+
Ethernet driver during bus enumeration, encoded in string.
36+
This interface mode is used to configure the Ethernet MAC with the
37+
appropriate mode for its data lines to the PHY hardware.
38+
Possible values are:
3239
<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
3340
rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
3441
xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
3+
Vendor Device Drivers
4+
=====================
5+
6+
Contents:
7+
8+
.. toctree::
9+
:maxdepth: 2
10+
11+
freescale/dpaa2/index
12+
intel/e100
13+
intel/e1000
14+
intel/e1000e
15+
intel/fm10k
16+
intel/igb
17+
intel/igbvf
18+
intel/ixgb
19+
intel/ixgbe
20+
intel/ixgbevf
21+
intel/i40e
22+
intel/iavf
23+
intel/ice
24+
25+
.. only:: subproject
26+
27+
Indices
28+
=======
29+
30+
* :ref:`genindex`

Documentation/networking/index.rst

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,7 @@ Contents:
1111
batman-adv
1212
can
1313
can_ucan_protocol
14-
device_drivers/freescale/dpaa2/index
15-
device_drivers/intel/e100
16-
device_drivers/intel/e1000
17-
device_drivers/intel/e1000e
18-
device_drivers/intel/fm10k
19-
device_drivers/intel/igb
20-
device_drivers/intel/igbvf
21-
device_drivers/intel/ixgb
22-
device_drivers/intel/ixgbe
23-
device_drivers/intel/ixgbevf
24-
device_drivers/intel/i40e
25-
device_drivers/intel/iavf
26-
device_drivers/intel/ice
14+
device_drivers/index
2715
dsa/index
2816
devlink-info-versions
2917
ieee802154
@@ -40,6 +28,8 @@ Contents:
4028
checksum-offloads
4129
segmentation-offloads
4230
scaling
31+
tls
32+
tls-offload
4333

4434
.. only:: subproject
4535

Documentation/networking/tls-offload-layers.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)