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

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from Bluetooth.

  Current release - regressions:

   - tcp: refine sk_rcvbuf increase for ooo packets

   - bluetooth: fix attempting to send HCI_Disconnect to BIS handle

   - rxrpc: fix over large frame size warning

   - eth: bcmgenet: initialize u64 stats seq counter

  Previous releases - regressions:

   - tcp: correct signedness in skb remaining space calculation

   - sched: abort __tc_modify_qdisc if parent class does not exist

   - vsock: fix transport_{g2h,h2g} TOCTOU

   - rxrpc: fix bug due to prealloc collision

   - tipc: fix use-after-free in tipc_conn_close().

   - bluetooth: fix not marking Broadcast Sink BIS as connected

   - phy: qca808x: fix WoL issue by utilizing at8031_set_wol()

   - eth: am65-cpsw-nuss: fix skb size by accounting for skb_shared_info

  Previous releases - always broken:

   - netlink: fix wraparounds of sk->sk_rmem_alloc.

   - atm: fix infinite recursive call of clip_push().

   - eth:
      - stmmac: fix interrupt handling for level-triggered mode in DWC_XGMAC2
      - rtsn: fix a null pointer dereference in rtsn_probe()"

* tag 'net-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (37 commits)
  net/sched: sch_qfq: Fix null-deref in agg_dequeue
  rxrpc: Fix oops due to non-existence of prealloc backlog struct
  rxrpc: Fix bug due to prealloc collision
  MAINTAINERS: remove myself as netronome maintainer
  selftests/net: packetdrill: add tcp_ooo-before-and-after-accept.pkt
  tcp: refine sk_rcvbuf increase for ooo packets
  net/sched: Abort __tc_modify_qdisc if parent class does not exist
  net: ethernet: ti: am65-cpsw-nuss: Fix skb size by accounting for skb_shared_info
  net: thunderx: avoid direct MTU assignment after WRITE_ONCE()
  selftests/tc-testing: Create test case for UAF scenario with DRR/NETEM/BLACKHOLE chain
  atm: clip: Fix NULL pointer dereference in vcc_sendmsg()
  atm: clip: Fix infinite recursive call of clip_push().
  atm: clip: Fix memory leak of struct clip_vcc.
  atm: clip: Fix potential null-ptr-deref in to_atmarpd().
  net: phy: smsc: Fix link failure in forced mode with Auto-MDIX
  net: phy: smsc: Force predictable MDI-X state on LAN87xx
  net: phy: smsc: Fix Auto-MDIX configuration when disabled by strap
  net: stmmac: Fix interrupt handling for level-triggered mode in DWC_XGMAC2
  rxrpc: Fix over large frame size warning
  net: airoha: Fix an error handling path in airoha_probe()
  ...
parents 73d7cf07 dd831ac8

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
              - allwinner,sun20i-d1-emac

              - allwinner,sun50i-h6-emac

              - allwinner,sun50i-h616-emac0

              - allwinner,sun55i-a523-emac0

              - allwinner,sun55i-a523-gmac0

          - const: allwinner,sun50i-a64-emac



  reg:

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -17224,10 +17224,10 @@ F: drivers/rtc/rtc-ntxec.c 
F:	include/linux/mfd/ntxec.h









NETRONOME ETHERNET DRIVERS









M:	Louis Peens <louis.peens@corigine.com>









R:	Jakub Kicinski <kuba@kernel.org>









R:	Simon Horman <horms@kernel.org>









L:	oss-drivers@corigine.com









S:	Maintained









S:	Odd Fixes









F:	drivers/net/ethernet/netronome/

















NETWORK BLOCK DEVICE (NBD)

























drivers/net/ethernet/airoha/airoha_eth.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -2984,6 +2984,7 @@ static int airoha_probe(struct platform_device *pdev)







error_napi_stop:









	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)









		airoha_qdma_stop_napi(&eth->qdma[i]);









	airoha_ppe_deinit(eth);









error_hw_cleanup:









	for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)









		airoha_hw_cleanup(&eth->qdma[i]);
































drivers/net/ethernet/broadcom/bnxt/bnxt.c



+4
−6






























Original line number
Diff line number
Diff line







@@ -11607,11 +11607,9 @@ static void bnxt_free_irq(struct bnxt *bp)

















static int bnxt_request_irq(struct bnxt *bp)









{









	struct cpu_rmap *rmap = NULL;









	int i, j, rc = 0;









	unsigned long flags = 0;









#ifdef CONFIG_RFS_ACCEL









	struct cpu_rmap *rmap;









#endif



















	rc = bnxt_setup_int_mode(bp);









	if (rc) {








@@ -11632,15 +11630,15 @@ static int bnxt_request_irq(struct bnxt *bp)







		int map_idx = bnxt_cp_num_to_irq_num(bp, i);









		struct bnxt_irq *irq = &bp->irq_tbl[map_idx];



















#ifdef CONFIG_RFS_ACCEL









		if (rmap && bp->bnapi[i]->rx_ring) {









		if (IS_ENABLED(CONFIG_RFS_ACCEL) &&









		    rmap && bp->bnapi[i]->rx_ring) {









			rc = irq_cpu_rmap_add(rmap, irq->vector);









			if (rc)









				netdev_warn(bp->dev, "failed adding irq rmap for ring %d\n",









					    j);









			j++;









		}









#endif



















		rc = request_irq(irq->vector, irq->handler, flags, irq->name,









				 bp->bnapi[i]);









		if (rc)
































drivers/net/ethernet/broadcom/genet/bcmgenet.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -4092,6 +4092,12 @@ static int bcmgenet_probe(struct platform_device *pdev)







	for (i = 0; i <= priv->hw_params->rx_queues; i++)









		priv->rx_rings[i].rx_max_coalesced_frames = 1;



















	/* Initialize u64 stats seq counter for 32bit machines */









	for (i = 0; i <= priv->hw_params->rx_queues; i++)









		u64_stats_init(&priv->rx_rings[i].stats64.syncp);









	for (i = 0; i <= priv->hw_params->tx_queues; i++)









		u64_stats_init(&priv->tx_rings[i].stats64.syncp);



















	/* libphy will determine the link state */









	netif_carrier_off(dev);