Commit 37816488 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
  Previous releases - regressions:

   - netlink: avoid infinite retry looping in netlink_unicast()

  Previous releases - always broken:

   - packet: fix a race in packet_set_ring() and packet_notifier()

   - ipv6: reject malicious packets in ipv6_gso_segment()

   - sched: mqprio: fix stack out-of-bounds write in tc entry parsing

   - net: drop UFO packets (injected via virtio) in udp_rcv_segment()

   - eth: mlx5: correctly set gso_segs when LRO is used, avoid false
     positive checksum validation errors

   - netpoll: prevent hanging NAPI when netcons gets enabled

   - phy: mscc: fix parsing of unicast frames for PTP timestamping

   - a number of device tree / OF reference leak fixes"

* tag 'net-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (44 commits)
  pptp: fix pptp_xmit() error path
  net: ti: icssg-prueth: Fix skb handling for XDP_PASS
  net: Update threaded state in napi config in netif_set_threaded
  selftests: netdevsim: Xfail nexthop test on slow machines
  eth: fbnic: Lock the tx_dropped update
  eth: fbnic: Fix tx_dropped reporting
  eth: fbnic: remove the debugging trick of super high page bias
  net: ftgmac100: fix potential NULL pointer access in ftgmac100_phy_disconnect
  dt-bindings: net: Replace bouncing Alexandru Tachici emails
  dpll: zl3073x: ZL3073X_I2C and ZL3073X_SPI should depend on NET
  net/sched: mqprio: fix stack out-of-bounds write in tc entry parsing
  Revert "net: mdio_bus: Use devm for getting reset GPIO"
  selftests: net: packetdrill: xfail all problems on slow machines
  net/packet: fix a race in packet_set_ring() and packet_notifier()
  benet: fix BUG when creating VFs
  net: airoha: npu: Add missing MODULE_FIRMWARE macros
  net: devmem: fix DMA direction on unmapping
  ipa: fix compile-testing with qcom-mdt=m
  eth: fbnic: unlink NAPIs from queues on error to open
  net: Add locking to protect skb->dev access in ip_output
  ...
parents bec07716 ae633388

Documentation/devicetree/bindings/net/adi,adin.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Analog Devices ADIN1200/ADIN1300 PHY



maintainers:

  - Alexandru Tachici <alexandru.tachici@analog.com>

  - Marcelo Schmitt <marcelo.schmitt@analog.com>



description: |

  Bindings for Analog Devices Industrial Ethernet PHYs

Documentation/devicetree/bindings/net/adi,adin1110.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: ADI ADIN1110 MAC-PHY



maintainers:

  - Alexandru Tachici <alexandru.tachici@analog.com>

  - Marcelo Schmitt <marcelo.schmitt@analog.com>



description: |

  The ADIN1110 is a low power single port 10BASE-T1L MAC-

Documentation/netlink/specs/ethtool.yaml

+3 −3
Original line number Diff line number Diff line
@@ -2342,9 +2342,6 @@ operations: 


      do: &module-eeprom-get-op

        request:

          attributes:

            - header

        reply:

          attributes:

            - header

            - offset
@@ -2352,6 +2349,9 @@ operations: 
            - page

            - bank

            - i2c-address

        reply:

          attributes:

            - header

            - data

      dump: *module-eeprom-get-op

    -

drivers/dpll/zl3073x/Kconfig

+5 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



config ZL3073X

	tristate "Microchip Azurite DPLL/PTP/SyncE devices"

	tristate "Microchip Azurite DPLL/PTP/SyncE devices" if COMPILE_TEST

	depends on NET

	select DPLL

	select NET_DEVLINK
@@ -16,9 +16,9 @@ config ZL3073X 


config ZL3073X_I2C

	tristate "I2C bus implementation for Microchip Azurite devices"

	depends on I2C && ZL3073X

	depends on I2C && NET

	select REGMAP_I2C

	default m

	select ZL3073X

	help

	  This is I2C bus implementation for Microchip Azurite DPLL/PTP/SyncE

	  devices.
@@ -28,9 +28,9 @@ config ZL3073X_I2C 


config ZL3073X_SPI

	tristate "SPI bus implementation for Microchip Azurite devices"

	depends on SPI && ZL3073X

	depends on NET && SPI

	select REGMAP_SPI

	default m

	select ZL3073X

	help

	  This is SPI bus implementation for Microchip Azurite DPLL/PTP/SyncE

	  devices.

drivers/net/ethernet/airoha/airoha_npu.c

+2 −0
Original line number Diff line number Diff line
@@ -579,6 +579,8 @@ static struct platform_driver airoha_npu_driver = { 
};

module_platform_driver(airoha_npu_driver);



MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);

MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");

MODULE_DESCRIPTION("Airoha Network Processor Unit driver");