Commit 036e3431 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 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
  ...
parents adc3f554 100f6d8e

Documentation/ABI/testing/sysfs-bus-mdio

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
What:		/sys/bus/mdio_bus/devices/.../phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the 32-bit PHY Identifier as reported

		by the device during bus enumeration, encoded in hexadecimal.

		This ID is used to match the device with the appropriate

		driver.



What:		/sys/bus/mdio_bus/devices/.../phy_interface

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the PHY interface as configured by the

		Ethernet driver during bus enumeration, encoded in string.

		This interface mode is used to configure the Ethernet MAC with the

		appropriate mode for its data lines to the PHY hardware.



What:		/sys/bus/mdio_bus/devices/.../phy_has_fixups

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the boolean value whether a given PHY

		device has had any "fixup" workaround running on it, encoded as

		a boolean. This information is provided to help troubleshooting

		PHY configurations.

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

+13 −6
Original line number Diff line number Diff line
@@ -11,24 +11,31 @@ Date: February 2014 
KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		Boolean value indicating whether the PHY device has

		any fixups registered against it (phy_register_fixup)

		This attribute contains the boolean value whether a given PHY

		device has had any "fixup" workaround running on it, encoded as

		a boolean. This information is provided to help troubleshooting

		PHY configurations.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		32-bit hexadecimal value corresponding to the PHY device's OUI,

		model and revision number.

		This attribute contains the 32-bit PHY Identifier as reported

		by the device during bus enumeration, encoded in hexadecimal.

		This ID is used to match the device with the appropriate

		driver.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_interface

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		String value indicating the PHY interface, possible

		values are:.

		This attribute contains the PHY interface as configured by the

		Ethernet driver during bus enumeration, encoded in string.

		This interface mode is used to configure the Ethernet MAC with the

		appropriate mode for its data lines to the PHY hardware.

		Possible values are:

		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,

		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii

		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

Documentation/networking/device_drivers/index.rst

0 → 100644
+30 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)



Vendor Device Drivers

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



Contents:



.. toctree::

   :maxdepth: 2



   freescale/dpaa2/index

   intel/e100

   intel/e1000

   intel/e1000e

   intel/fm10k

   intel/igb

   intel/igbvf

   intel/ixgb

   intel/ixgbe

   intel/ixgbevf

   intel/i40e

   intel/iavf

   intel/ice



.. only::  subproject



   Indices

   =======



   * :ref:`genindex`

Documentation/networking/index.rst

+3 −13
Original line number Diff line number Diff line
@@ -11,19 +11,7 @@ Contents: 
   batman-adv

   can

   can_ucan_protocol

   device_drivers/freescale/dpaa2/index

   device_drivers/intel/e100

   device_drivers/intel/e1000

   device_drivers/intel/e1000e

   device_drivers/intel/fm10k

   device_drivers/intel/igb

   device_drivers/intel/igbvf

   device_drivers/intel/ixgb

   device_drivers/intel/ixgbe

   device_drivers/intel/ixgbevf

   device_drivers/intel/i40e

   device_drivers/intel/iavf

   device_drivers/intel/ice

   device_drivers/index

   dsa/index

   devlink-info-versions

   ieee802154
@@ -40,6 +28,8 @@ Contents: 
   checksum-offloads

   segmentation-offloads

   scaling

   tls

   tls-offload



.. only::  subproject

Documentation/networking/tls-offload-layers.svg

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE