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

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

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

  Current release - new code bugs:

   - sched: cake: fixup cake_mq rate adjustment for diffserv config

   - wifi: fix missing ieee80211_eml_params member initialization

  Previous releases - regressions:

   - tcp: give up on stronger sk_rcvbuf checks (for now)

  Previous releases - always broken:

   - net: fix rcu_tasks stall in threaded busypoll

   - sched:
      - fq: clear q->band_pkt_count[] in fq_reset()
      - only allow act_ct to bind to clsact/ingress qdiscs and shared
        blocks

   - bridge: check relevant per-VLAN options in VLAN range grouping

   - xsk: fix fragment node deletion to prevent buffer leak

  Misc:

   - spring cleanup of inactive maintainers"

* tag 'net-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (138 commits)
  xdp: produce a warning when calculated tailroom is negative
  net: enetc: use truesize as XDP RxQ info frag_size
  libeth, idpf: use truesize as XDP RxQ info frag_size
  i40e: use xdp.frame_sz as XDP RxQ info frag_size
  i40e: fix registering XDP RxQ info
  ice: change XDP RxQ frag_size from DMA write length to xdp.frame_sz
  ice: fix rxq info registering in mbuf packets
  xsk: introduce helper to determine rxq->frag_size
  xdp: use modulo operation to calculate XDP frag tailroom
  selftests/tc-testing: Add tests exercising act_ife metalist replace behaviour
  net/sched: act_ife: Fix metalist update behavior
  selftests: net: add test for IPv4 route with loopback IPv6 nexthop
  net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
  net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
  net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
  MAINTAINERS: remove Thomas Falcon from IBM ibmvnic
  MAINTAINERS: remove Claudiu Manoil and Alexandre Belloni from Ocelot switch
  MAINTAINERS: replace Taras Chornyi with Elad Nachman for Marvell Prestera
  MAINTAINERS: remove Jonathan Lemon from OpenCompute PTP
  MAINTAINERS: replace Clark Wang with Frank Li for Freescale FEC
  ...
parents 18ecff39 cf440e5b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@opinsys.com> 
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Jason Xing <kerneljasonxing@gmail.com>  <kernelxing@tencent.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
@@ -401,6 +402,7 @@ Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz> 
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>

Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Jishnu Prakash <quic_jprakash@quicinc.com> <jprakash@codeaurora.org>

Joe Damato <joe@dama.to> <jdamato@fastly.com>

Joel Granados <joel.granados@kernel.org> <j.granados@samsung.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,10 @@ N: Veaceslav Falico 
E: vfalico@gmail.com

D: Co-maintainer and co-author of the network bonding driver.



N: Thomas Falcon

E: tlfalcon@linux.ibm.com

D: Initial author of the IBM ibmvnic network driver



N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes
@@ -2415,6 +2419,10 @@ S: Am Muehlenweg 38 
S: D53424 Remagen

S: Germany



N: Jonathan Lemon

E: jonathan.lemon@gmail.com

D: OpenCompute PTP clock driver (ptp_ocp)



N: Colin Leroy

E: colin@colino.net

W: http://www.geekounet.org/

Documentation/devicetree/bindings/net/can/nxp,sja1000.yaml

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ required: 


allOf:

  - $ref: can-controller.yaml#

  - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml

  - if:

      properties:

        compatible:

MAINTAINERS

+5 −19
Original line number Diff line number Diff line
@@ -993,10 +993,8 @@ F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.yaml 
F:	drivers/thermal/thermal_mmio.c









AMAZON ETHERNET DRIVERS









M:	Shay Agroskin <shayagr@amazon.com>









M:	Arthur Kiyanovski <akiyano@amazon.com>









R:	David Arinzon <darinzon@amazon.com>









R:	Saeed Bishara <saeedb@amazon.com>









M:	David Arinzon <darinzon@amazon.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/networking/device_drivers/ethernet/amazon/ena.rst








@@ -4617,7 +4615,6 @@ F:	drivers/bluetooth/















BLUETOOTH SUBSYSTEM









M:	Marcel Holtmann <marcel@holtmann.org>









M:	Johan Hedberg <johan.hedberg@gmail.com>









M:	Luiz Augusto von Dentz <luiz.dentz@gmail.com>









L:	linux-bluetooth@vger.kernel.org









S:	Supported








@@ -10171,8 +10168,8 @@ F:	drivers/i2c/busses/i2c-cpm.c















FREESCALE IMX / MXC FEC DRIVER









M:	Wei Fang <wei.fang@nxp.com>









R:	Frank Li <frank.li@nxp.com>









R:	Shenwei Wang <shenwei.wang@nxp.com>









R:	Clark Wang <xiaoning.wang@nxp.com>









L:	imx@lists.linux.dev









L:	netdev@vger.kernel.org









S:	Maintained








@@ -12216,7 +12213,6 @@ IBM Power SRIOV Virtual NIC Device Driver







M:	Haren Myneni <haren@linux.ibm.com>









M:	Rick Lindsley <ricklind@linux.ibm.com>









R:	Nick Child <nnac123@linux.ibm.com>









R:	Thomas Falcon <tlfalcon@linux.ibm.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/ibm/ibmvnic.*








@@ -15375,10 +15371,8 @@ F:	drivers/crypto/marvell/







F:	include/linux/soc/marvell/octeontx2/

















MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)









M:	Mirko Lindner <mlindner@marvell.com>









M:	Stephen Hemminger <stephen@networkplumber.org>









L:	netdev@vger.kernel.org









S:	Odd fixes









S:	Orphan









F:	drivers/net/ethernet/marvell/sk*

















MARVELL LIBERTAS WIRELESS DRIVER








@@ -15475,7 +15469,6 @@ MARVELL OCTEONTX2 RVU ADMIN FUNCTION DRIVER







M:	Sunil Goutham <sgoutham@marvell.com>









M:	Linu Cherian <lcherian@marvell.com>









M:	Geetha sowjanya <gakula@marvell.com>









M:	Jerin Jacob <jerinj@marvell.com>









M:	hariprasad <hkelam@marvell.com>









M:	Subbaraya Sundeep <sbhatta@marvell.com>









L:	netdev@vger.kernel.org








@@ -15490,7 +15483,7 @@ S:	Supported







F:	drivers/perf/marvell_pem_pmu.c

















MARVELL PRESTERA ETHERNET SWITCH DRIVER









M:	Taras Chornyi <taras.chornyi@plvision.eu>









M:	Elad Nachman <enachman@marvell.com>









S:	Supported









W:	https://github.com/Marvell-switching/switchdev-prestera









F:	drivers/net/ethernet/marvell/prestera/








@@ -16164,7 +16157,6 @@ F:	drivers/dma/mediatek/















MEDIATEK ETHERNET DRIVER









M:	Felix Fietkau <nbd@nbd.name>









M:	Sean Wang <sean.wang@mediatek.com>









M:	Lorenzo Bianconi <lorenzo@kernel.org>









L:	netdev@vger.kernel.org









S:	Maintained








@@ -16357,8 +16349,6 @@ F:	include/soc/mediatek/smi.h







MEDIATEK SWITCH DRIVER









M:	Chester A. Unal <chester.a.unal@arinc9.com>









M:	Daniel Golle <daniel@makrotopia.org>









M:	DENG Qingfang <dqfext@gmail.com>









M:	Sean Wang <sean.wang@mediatek.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/dsa/mt7530-mdio.c








@@ -19226,8 +19216,6 @@ F:	tools/objtool/















OCELOT ETHERNET SWITCH DRIVER









M:	Vladimir Oltean <vladimir.oltean@nxp.com>









M:	Claudiu Manoil <claudiu.manoil@nxp.com>









M:	Alexandre Belloni <alexandre.belloni@bootlin.com>









M:	UNGLinuxDriver@microchip.com









L:	netdev@vger.kernel.org









S:	Supported








@@ -19813,7 +19801,6 @@ F:	arch/*/boot/dts/







F:	include/dt-bindings/

















OPENCOMPUTE PTP CLOCK DRIVER









M:	Jonathan Lemon <jonathan.lemon@gmail.com>









M:	Vadim Fedorenko <vadim.fedorenko@linux.dev>









L:	netdev@vger.kernel.org









S:	Maintained








@@ -21457,9 +21444,8 @@ S:	Supported







F:	drivers/scsi/qedi/

















QLOGIC QL4xxx ETHERNET DRIVER









M:	Manish Chopra <manishc@marvell.com>









L:	netdev@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/ethernet/qlogic/qed/









F:	drivers/net/ethernet/qlogic/qede/









F:	include/linux/qed/

























drivers/net/bonding/bond_main.c



+7
−2






























Original line number
Diff line number
Diff line







@@ -324,7 +324,7 @@ static bool bond_sk_check(struct bonding *bond)







	}









}



















bool bond_xdp_check(struct bonding *bond, int mode)









bool __bond_xdp_check(int mode, int xmit_policy)









{









	switch (mode) {









	case BOND_MODE_ROUNDROBIN:








@@ -335,7 +335,7 @@ bool bond_xdp_check(struct bonding *bond, int mode)







		/* vlan+srcmac is not supported with XDP as in most cases the 802.1q









		 * payload is not in the packet due to hardware offload.









		 */









		if (bond->params.xmit_policy != BOND_XMIT_POLICY_VLAN_SRCMAC)









		if (xmit_policy != BOND_XMIT_POLICY_VLAN_SRCMAC)









			return true;









		fallthrough;









	default:








@@ -343,6 +343,11 @@ bool bond_xdp_check(struct bonding *bond, int mode)







	}









}



















bool bond_xdp_check(struct bonding *bond, int mode)









{









	return __bond_xdp_check(mode, bond->params.xmit_policy);









}



















/*---------------------------------- VLAN -----------------------------------*/



















/* In the following 2 functions, bond_vlan_rx_add_vid and bond_vlan_rx_kill_vid,