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

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter and wireless.

  Current release - fix to a fix:

   - net: do not write to msg_get_inq in callee

   - arp: do not assume dev_hard_header() does not change skb->head

  Current release - regressions:

   - wifi: mac80211: don't iterate not running interfaces

   - eth: mlx5: fix NULL pointer dereference in ioctl module EEPROM

  Current release - new code bugs:

   - eth: bnge: add AUXILIARY_BUS to Kconfig dependencies

  Previous releases - regressions:

   - eth: mlx5: dealloc forgotten PSP RX modify header

  Previous releases - always broken:

   - ping: fix ICMP out SNMP stats double-counting with ICMP sockets

   - bonding: preserve NETIF_F_ALL_FOR_ALL across TSO updates

   - bridge: fix C-VLAN preservation in 802.1ad vlan_tunnel egress

   - eth: bnxt: fix potential data corruption with HW GRO/LRO"

* tag 'net-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (70 commits)
  arp: do not assume dev_hard_header() does not change skb->head
  net: enetc: fix build warning when PAGE_SIZE is greater than 128K
  atm: Fix dma_free_coherent() size
  tools: ynl: don't install tests
  net: do not write to msg_get_inq in callee
  bnxt_en: Fix NULL pointer crash in bnxt_ptp_enable during error cleanup
  net: usb: pegasus: fix memory leak in update_eth_regs_async()
  net: 3com: 3c59x: fix possible null dereference in vortex_probe1()
  net/sched: sch_qfq: Fix NULL deref when deactivating inactive aggregate in qfq_reset
  wifi: mac80211: collect station statistics earlier when disconnect
  wifi: mac80211: restore non-chanctx injection behaviour
  wifi: mac80211_hwsim: disable BHs for hwsim_radio_lock
  wifi: mac80211: don't iterate not running interfaces
  wifi: mac80211_hwsim: fix typo in frequency notification
  wifi: avoid kernel-infoleak from struct iw_point
  net: airoha: Fix schedule while atomic in airoha_ppe_deinit()
  selftests: netdevsim: add carrier state consistency test
  net: netdevsim: fix inconsistent carrier state after link/unlink
  selftests: drv-net: Bring back tool() to driver __init__s
  net/sched: act_api: avoid dereferencing ERR_PTR in tcf_idrinfo_destroy
  ...
parents 79b95d74 c92510f5

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>

Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>

Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>

Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>

Documentation/netlink/specs/netdev.yaml

+4 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ attribute-sets: 
        name: ifindex

        doc: |

          ifindex of the netdev to which the pool belongs.

          May be reported as 0 if the page pool was allocated for a netdev

          May not be reported if the page pool was allocated for a netdev

          which got destroyed already (page pools may outlast their netdevs

          because they wait for all memory to be returned).

        type: u32
@@ -601,7 +601,9 @@ operations: 
      name: page-pool-get

      doc: |

        Get / dump information about Page Pools.

        (Only Page Pools associated with a net_device can be listed.)

        Only Page Pools associated by the driver with a net_device

        can be listed. ifindex will not be reported if the net_device

        no longer exists.

      attribute-set: page-pool

      do:

        request:

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1283,6 +1283,7 @@ F: include/uapi/drm/amdxdna_accel.h 








AMD XGBE DRIVER









M:	"Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>









M:	Raju Rangoju <Raju.Rangoju@amd.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi








@@ -18283,7 +18284,7 @@ X:	net/wireless/







X:	tools/testing/selftests/net/can/

















NETWORKING [IOAM]









M:	Justin Iurman <justin.iurman@uliege.be>









M:	Justin Iurman <justin.iurman@gmail.com>









S:	Maintained









F:	Documentation/networking/ioam6*









F:	include/linux/ioam6*

























drivers/atm/he.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -1587,7 +1587,8 @@ he_stop(struct he_dev *he_dev)







				  he_dev->tbrq_base, he_dev->tbrq_phys);



















	if (he_dev->tpdrq_base)









		dma_free_coherent(&he_dev->pci_dev->dev, CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq),









		dma_free_coherent(&he_dev->pci_dev->dev,









				  CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq),









				  he_dev->tpdrq_base, he_dev->tpdrq_phys);



















	dma_pool_destroy(he_dev->tpd_pool);
































drivers/net/dsa/mv88e6xxx/chip.c



+0
−23






























Original line number
Diff line number
Diff line







@@ -3364,13 +3364,10 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)

















static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)









{









	struct device_node *phy_handle = NULL;









	struct fwnode_handle *ports_fwnode;









	struct fwnode_handle *port_fwnode;









	struct dsa_switch *ds = chip->ds;









	struct mv88e6xxx_port *p;









	struct dsa_port *dp;









	int tx_amp;









	int err;









	u16 reg;









	u32 val;








@@ -3582,23 +3579,6 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)







			return err;









	}



















	if (chip->info->ops->serdes_set_tx_amplitude) {









		dp = dsa_to_port(ds, port);









		if (dp)









			phy_handle = of_parse_phandle(dp->dn, "phy-handle", 0);



















		if (phy_handle && !of_property_read_u32(phy_handle,









							"tx-p2p-microvolt",









							&tx_amp))









			err = chip->info->ops->serdes_set_tx_amplitude(chip,









								port, tx_amp);









		if (phy_handle) {









			of_node_put(phy_handle);









			if (err)









				return err;









		}









	}



















	/* Port based VLAN map: give each port the same default address









	 * database, and allow bidirectional communication between the









	 * CPU and DSA port(s), and the other ports.








@@ -4768,7 +4748,6 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {







	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,









	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,









	.serdes_get_regs = mv88e6352_serdes_get_regs,









	.serdes_set_tx_amplitude = mv88e6352_serdes_set_tx_amplitude,









	.gpio_ops = &mv88e6352_gpio_ops,









	.phylink_get_caps = mv88e6352_phylink_get_caps,









	.pcs_ops = &mv88e6352_pcs_ops,








@@ -5044,7 +5023,6 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {







	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,









	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,









	.serdes_get_regs = mv88e6352_serdes_get_regs,









	.serdes_set_tx_amplitude = mv88e6352_serdes_set_tx_amplitude,









	.gpio_ops = &mv88e6352_gpio_ops,









	.avb_ops = &mv88e6352_avb_ops,









	.ptp_ops = &mv88e6352_ptp_ops,








@@ -5481,7 +5459,6 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {







	.serdes_get_stats = mv88e6352_serdes_get_stats,









	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,









	.serdes_get_regs = mv88e6352_serdes_get_regs,









	.serdes_set_tx_amplitude = mv88e6352_serdes_set_tx_amplitude,









	.phylink_get_caps = mv88e6352_phylink_get_caps,









	.pcs_ops = &mv88e6352_pcs_ops,









};