Commit 1f719a2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from WiFi and netfilter.

  Current release - regressions:

   - nic: intel: fix old compiler regressions

   - netfilter: ipset: missing gc cancellations fixed

  Current release - new code bugs:

   - netfilter: ctnetlink: fix filtering for zone 0

  Previous releases - regressions:

   - core: fix from address in memcpy_to_iter_csum()

   - netfilter: nfnetlink_queue: un-break NF_REPEAT

   - af_unix: fix memory leak for dead unix_(sk)->oob_skb in GC.

   - devlink: avoid potential loop in devlink_rel_nested_in_notify_work()

   - iwlwifi:
       - mvm: fix a battery life regression
       - fix double-free bug

   - mac80211: fix waiting for beacons logic

   - nic: nfp: flower: prevent re-adding mac index for bonded port

  Previous releases - always broken:

   - rxrpc: fix generation of serial numbers to skip zero

   - tipc: check the bearer type before calling tipc_udp_nl_bearer_add()

   - tunnels: fix out of bounds access when building IPv6 PMTU error

   - nic: hv_netvsc: register VF in netvsc_probe if NET_DEVICE_REGISTER
     missed

   - nic: atlantic: fix DMA mapping for PTP hwts ring

  Misc:

   - selftests: more fixes to deal with very slow hosts"

* tag 'net-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (80 commits)
  netfilter: nft_set_pipapo: remove scratch_aligned pointer
  netfilter: nft_set_pipapo: add helper to release pcpu scratch area
  netfilter: nft_set_pipapo: store index in scratch maps
  netfilter: nft_set_rbtree: skip end interval element from gc
  netfilter: nfnetlink_queue: un-break NF_REPEAT
  netfilter: nf_tables: use timestamp to check for set element timeout
  netfilter: nft_ct: reject direction for ct id
  netfilter: ctnetlink: fix filtering for zone 0
  s390/qeth: Fix potential loss of L3-IP@ in case of network issues
  netfilter: ipset: Missing gc cancellations fixed
  octeontx2-af: Initialize maps.
  net: ethernet: ti: cpsw: enable mac_managed_pm to fix mdio
  net: ethernet: ti: cpsw_new: enable mac_managed_pm to fix mdio
  netfilter: nft_set_pipapo: remove static in nft_pipapo_get()
  netfilter: nft_compat: restrict match/target protocol to u16
  netfilter: nft_compat: reject unused compat flag
  netfilter: nft_compat: narrow down revision to unsigned 8-bits
  net: intel: fix old compiler regressions
  MAINTAINERS: Maintainer change for rds
  selftests: cmsg_ipv6: repeat the exact packet
  ...
parents b0d5d0f7 63e4b9d6

MAINTAINERS

+5 −6
Original line number Diff line number Diff line
@@ -4169,14 +4169,14 @@ F: drivers/firmware/broadcom/tee_bnxt_fw.c 
F:	drivers/net/ethernet/broadcom/bnxt/

F:	include/linux/firmware/broadcom/tee_bnxt_fw.h









BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER









M:	Arend van Spriel <aspriel@gmail.com>









M:	Franky Lin <franky.lin@broadcom.com>









M:	Hante Meuleman <hante.meuleman@broadcom.com>









BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS









M:	Arend van Spriel <arend.vanspriel@broadcom.com>









L:	linux-wireless@vger.kernel.org









L:	brcm80211@lists.linux.dev









L:	brcm80211-dev-list.pdl@broadcom.com









S:	Supported









F:	drivers/net/wireless/broadcom/brcm80211/









F:	include/linux/platform_data/brcmfmac.h

















BROADCOM BRCMSTB GPIO DRIVER









M:	Doug Berger <opendmb@gmail.com>








@@ -11127,7 +11127,6 @@ S:	Supported







F:	drivers/net/wireless/intel/iwlegacy/

















INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Gregory Greenman <gregory.greenman@intel.com>









M:	Miri Korenblit <miriam.rachel.korenblit@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported








@@ -18432,7 +18431,7 @@ S:	Supported







F:	drivers/infiniband/sw/rdmavt

















RDS - RELIABLE DATAGRAM SOCKETS









M:	Santosh Shilimkar <santosh.shilimkar@oracle.com>









M:	Allison Henderson <allison.henderson@oracle.com>









L:	netdev@vger.kernel.org









L:	linux-rdma@vger.kernel.org









L:	rds-devel@oss.oracle.com (moderated for non-subscribers)

























drivers/atm/idt77252.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -2930,6 +2930,8 @@ open_card_ubr0(struct idt77252_dev *card)







	vc->scq = alloc_scq(card, vc->class);









	if (!vc->scq) {









		printk("%s: can't get SCQ.\n", card->name);









		kfree(card->vcs[0]);









		card->vcs[0] = NULL;









		return -ENOMEM;









	}










































drivers/net/ethernet/aquantia/atlantic/aq_ptp.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -993,7 +993,7 @@ int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic)







	return 0;



















err_exit_hwts_rx:









	aq_ring_free(&aq_ptp->hwts_rx);









	aq_ring_hwts_rx_free(&aq_ptp->hwts_rx);









err_exit_ptp_rx:









	aq_ring_free(&aq_ptp->ptp_rx);









err_exit_ptp_tx:








@@ -1011,7 +1011,7 @@ void aq_ptp_ring_free(struct aq_nic_s *aq_nic)

















	aq_ring_free(&aq_ptp->ptp_tx);









	aq_ring_free(&aq_ptp->ptp_rx);









	aq_ring_free(&aq_ptp->hwts_rx);









	aq_ring_hwts_rx_free(&aq_ptp->hwts_rx);



















	aq_ptp_skb_ring_release(&aq_ptp->skb_ring);









}
































drivers/net/ethernet/aquantia/atlantic/aq_ring.c



+13
−0






























Original line number
Diff line number
Diff line







@@ -919,6 +919,19 @@ void aq_ring_free(struct aq_ring_s *self)







	}









}



















void aq_ring_hwts_rx_free(struct aq_ring_s *self)









{









	if (!self)









		return;



















	if (self->dx_ring) {









		dma_free_coherent(aq_nic_get_dev(self->aq_nic),









				  self->size * self->dx_size + AQ_CFG_RXDS_DEF,









				  self->dx_ring, self->dx_ring_pa);









		self->dx_ring = NULL;









	}









}



















unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data)









{









	unsigned int count;
































drivers/net/ethernet/aquantia/atlantic/aq_ring.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -210,6 +210,7 @@ int aq_ring_rx_fill(struct aq_ring_s *self);







int aq_ring_hwts_rx_alloc(struct aq_ring_s *self,









			  struct aq_nic_s *aq_nic, unsigned int idx,









			  unsigned int size, unsigned int dx_size);









void aq_ring_hwts_rx_free(struct aq_ring_s *self);









void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic);



















unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data);