Commit 48a23ec6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Mostly driver fixes.

  Current release - regressions:

   - Revert "net: Add a second bind table hashed by port and address",
     needs more work

   - amd-xgbe: use platform_irq_count(), static setup of IRQ resources
     had been removed from DT core

   - dts: at91: ksz9477_evb: add phy-mode to fix port/phy validation

  Current release - new code bugs:

   - hns3: modify the ring param print info

  Previous releases - always broken:

   - axienet: make the 64b addressable DMA depends on 64b architectures

   - iavf: fix issue with MAC address of VF shown as zero

   - ice: fix PTP TX timestamp offset calculation

   - usb: ax88179_178a needs FLAG_SEND_ZLP

  Misc:

   - document some net.sctp.* sysctls"

* tag 'net-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (31 commits)
  net: axienet: add missing error return code in axienet_probe()
  Revert "net: Add a second bind table hashed by port and address"
  net: ax25: Fix deadlock caused by skb_recv_datagram in ax25_recvmsg
  net: usb: ax88179_178a needs FLAG_SEND_ZLP
  MAINTAINERS: add include/dt-bindings/net to NETWORKING DRIVERS
  ARM: dts: at91: ksz9477_evb: fix port/phy validation
  net: bgmac: Fix an erroneous kfree() in bgmac_remove()
  ice: Fix memory corruption in VF driver
  ice: Fix queue config fail handling
  ice: Sync VLAN filtering features for DVM
  ice: Fix PTP TX timestamp offset calculation
  mlxsw: spectrum_cnt: Reorder counter pools
  docs: networking: phy: Fix a typo
  amd-xgbe: Use platform_irq_count()
  octeontx2-vf: Add support for adaptive interrupt coalescing
  xilinx:  Fix build on x86.
  net: axienet: Use iowrite64 to write all 64b descriptor pointers
  net: axienet: make the 64b addresable DMA depends on 64b archectures
  net: hns3: fix tm port shapping of fibre port is incorrect after driver initialization
  net: hns3: fix PF rss size initialization bug
  ...
parents 30306f61 2e7bf4a6

Documentation/networking/ip-sysctl.rst

+37 −0
Original line number Diff line number Diff line
@@ -2925,6 +2925,43 @@ plpmtud_probe_interval - INTEGER 


	Default: 0



reconf_enable - BOOLEAN

        Enable or disable extension of Stream Reconfiguration functionality

        specified in RFC6525. This extension provides the ability to "reset"

        a stream, and it includes the Parameters of "Outgoing/Incoming SSN

        Reset", "SSN/TSN Reset" and "Add Outgoing/Incoming Streams".



	- 1: Enable extension.

	- 0: Disable extension.



	Default: 0



intl_enable - BOOLEAN

        Enable or disable extension of User Message Interleaving functionality

        specified in RFC8260. This extension allows the interleaving of user

        messages sent on different streams. With this feature enabled, I-DATA

        chunk will replace DATA chunk to carry user messages if also supported

        by the peer. Note that to use this feature, one needs to set this option

        to 1 and also needs to set socket options SCTP_FRAGMENT_INTERLEAVE to 2

        and SCTP_INTERLEAVING_SUPPORTED to 1.



	- 1: Enable extension.

	- 0: Disable extension.



	Default: 0



ecn_enable - BOOLEAN

        Control use of Explicit Congestion Notification (ECN) by SCTP.

        Like in TCP, ECN is used only when both ends of the SCTP connection

        indicate support for it. This feature is useful in avoiding losses

        due to congestion by allowing supporting routers to signal congestion

        before having to drop packets.



        1: Enable ecn.

        0: Disable ecn.



        Default: 1





``/proc/sys/net/core/*``

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

Documentation/networking/phy.rst

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ Whenever possible, use the PHY side RGMII delay for these reasons: 


* PHY device drivers in PHYLIB being reusable by nature, being able to

  configure correctly a specified delay enables more designs with similar delay

  requirements to be operate correctly

  requirements to be operated correctly



For cases where the PHY is not capable of providing this delay, but the

Ethernet MAC driver is capable of doing so, the correct phy_interface_t value

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13800,6 +13800,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git 
F:	Documentation/devicetree/bindings/net/

F:	drivers/connector/

F:	drivers/net/

F:	include/dt-bindings/net/

F:	include/linux/etherdevice.h

F:	include/linux/fcdevice.h

F:	include/linux/fddidevice.h

arch/arm/boot/dts/at91-sama5d3_ksz9477_evb.dts

+5 −0
Original line number Diff line number Diff line
@@ -120,26 +120,31 @@ 
			port@0 {

				reg = <0>;

				label = "lan1";

				phy-mode = "internal";

			};



			port@1 {

				reg = <1>;

				label = "lan2";

				phy-mode = "internal";

			};



			port@2 {

				reg = <2>;

				label = "lan3";

				phy-mode = "internal";

			};



			port@3 {

				reg = <3>;

				label = "lan4";

				phy-mode = "internal";

			};



			port@4 {

				reg = <4>;

				label = "lan5";

				phy-mode = "internal";

			};



			port@5 {

drivers/net/ethernet/amd/xgbe/xgbe-platform.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int xgbe_platform_probe(struct platform_device *pdev) 
		 *   the PHY resources listed last

		 */

		phy_memnum = xgbe_resource_count(pdev, IORESOURCE_MEM) - 3;

		phy_irqnum = xgbe_resource_count(pdev, IORESOURCE_IRQ) - 1;

		phy_irqnum = platform_irq_count(pdev) - 1;

		dma_irqnum = 1;

		dma_irqend = phy_irqnum;

	} else {
@@ -348,7 +348,7 @@ static int xgbe_platform_probe(struct platform_device *pdev) 
		phy_memnum = 0;

		phy_irqnum = 0;

		dma_irqnum = 1;

		dma_irqend = xgbe_resource_count(pdev, IORESOURCE_IRQ);

		dma_irqend = platform_irq_count(pdev);

	}



	/* Obtain the mmio areas for the device */