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

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

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

  We haven't accumulated much over the break. If it wasn't for the
  uninterrupted stream of fixes for Intel drivers this PR would be very
  slim. There was a handful of user reports, however, either they stood
  out because of the lower traffic or users have had more time to test
  over the break. The ones which are v6.7-relevant should be wrapped up.

  Current release - regressions:

   - Revert "net: ipv6/addrconf: clamp preferred_lft to the minimum
     required", it caused issues on networks where routers send prefixes
     with preferred_lft=0

   - wifi:
      - iwlwifi: pcie: don't synchronize IRQs from IRQ, prevent deadlock
      - mac80211: fix re-adding debugfs entries during reconfiguration

  Current release - new code bugs:

   - tcp: print AO/MD5 messages only if there are any keys

  Previous releases - regressions:

   - virtio_net: fix missing dma unmap for resize, prevent OOM

  Previous releases - always broken:

   - mptcp: prevent tcp diag from closing listener subflows

   - nf_tables:
      - set transport header offset for egress hook, fix IPv4 mangling
      - skip set commit for deleted/destroyed sets, avoid double deactivation

   - nat: make sure action is set for all ct states, fix openvswitch
     matching on ICMP packets in related state

   - eth: mlxbf_gige: fix receive hang under heavy traffic

   - eth: r8169: fix PCI error on system resume for RTL8168FP

   - net: add missing getsockopt(SO_TIMESTAMPING_NEW) and cmsg handling"

* tag 'net-6.7-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (52 commits)
  net/tcp: Only produce AO/MD5 logs if there are any keys
  net: Implement missing SO_TIMESTAMPING_NEW cmsg support
  bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()
  net: ravb: Wait for operating mode to be applied
  asix: Add check for usbnet_get_endpoints
  octeontx2-af: Re-enable MAC TX in otx2_stop processing
  octeontx2-af: Always configure NIX TX link credits based on max frame size
  net/smc: fix invalid link access in dumping SMC-R connections
  net/qla3xxx: fix potential memleak in ql_alloc_buffer_queues
  virtio_net: fix missing dma unmap for resize
  igc: Fix hicredit calculation
  ice: fix Get link status data length
  i40e: Restore VF MSI-X state during PCI reset
  i40e: fix use-after-free in i40e_aqc_add_filters()
  net: Save and restore msg_namelen in sock_sendmsg
  netfilter: nft_immediate: drop chain reference counter on error
  netfilter: nf_nat: fix action not being set for all ct states
  net: bcmgenet: Fix FCS generation for fragmented skbuffs
  mptcp: prevent tcp diag from closing listener subflows
  MAINTAINERS: add Geliang as reviewer for MPTCP
  ...
parents a476aae3 4c8530dc

Documentation/networking/ip-sysctl.rst

+1 −1
Original line number Diff line number Diff line
@@ -2511,7 +2511,7 @@ temp_valid_lft - INTEGER 
temp_prefered_lft - INTEGER

	Preferred lifetime (in seconds) for temporary addresses. If

	temp_prefered_lft is less than the minimum required lifetime (typically

	5 seconds), the preferred lifetime is the minimum required. If

	5 seconds), temporary addresses will not be created. If

	temp_prefered_lft is greater than temp_valid_lft, the preferred lifetime

	is temp_valid_lft.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -4127,7 +4127,6 @@ M: Franky Lin <franky.lin@broadcom.com> 
M:	Hante Meuleman <hante.meuleman@broadcom.com>

L:	linux-wireless@vger.kernel.org

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

L:	SHA-cyfmac-dev-list@infineon.com

S:	Supported

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








@@ -12824,7 +12823,7 @@ S:	Maintained







F:	drivers/net/ethernet/marvell/mvneta.*

















MARVELL MVPP2 ETHERNET DRIVER









M:	Marcin Wojtas <mw@semihalf.com>









M:	Marcin Wojtas <marcin.s.wojtas@gmail.com>









M:	Russell King <linux@armlinux.org.uk>









L:	netdev@vger.kernel.org









S:	Maintained








@@ -15087,6 +15086,7 @@ K:	\bmdo_







NETWORKING [MPTCP]









M:	Matthieu Baerts <matttbe@kernel.org>









M:	Mat Martineau <martineau@kernel.org>









R:	Geliang Tang <geliang.tang@linux.dev>









L:	netdev@vger.kernel.org









L:	mptcp@lists.linux.dev









S:	Maintained








@@ -15434,7 +15434,7 @@ F:	Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml







F:	drivers/bluetooth/btnxpuart.c

















NXP C45 TJA11XX PHY DRIVER









M:	Radu Pirea <radu-nicolae.pirea@oss.nxp.com>









M:	Andrei Botila <andrei.botila@oss.nxp.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/phy/nxp-c45-tja11xx.c
































drivers/connector/cn_proc.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -108,8 +108,9 @@ static inline void send_msg(struct cn_msg *msg)







		filter_data[1] = 0;









	}



















	cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT,









			     cn_filter, (void *)filter_data);









	if (cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT,









			     cn_filter, (void *)filter_data) == -ESRCH)









		atomic_set(&proc_event_num_listeners, 0);



















	local_unlock(&local_event.lock);









}
































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



+2
−2






























Original line number
Diff line number
Diff line







@@ -12093,6 +12093,8 @@ static void bnxt_sp_task(struct work_struct *work)







		bnxt_cfg_ntp_filters(bp);









	if (test_and_clear_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &bp->sp_event))









		bnxt_hwrm_exec_fwd_req(bp);









	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))









		netdev_info(bp->dev, "Receive PF driver unload event!\n");









	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event)) {









		bnxt_hwrm_port_qstats(bp, 0);









		bnxt_hwrm_port_qstats_ext(bp, 0);








@@ -13093,8 +13095,6 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp)







			}









		}









	}









	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))









		netdev_info(bp->dev, "Receive PF driver unload event!\n");









}



















#else
































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



+3
−1






























Original line number
Diff line number
Diff line







@@ -2132,8 +2132,10 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)







		/* Note: if we ever change from DMA_TX_APPEND_CRC below we









		 * will need to restore software padding of "runt" packets









		 */









		len_stat |= DMA_TX_APPEND_CRC;



















		if (!i) {









			len_stat |= DMA_TX_APPEND_CRC | DMA_SOP;









			len_stat |= DMA_SOP;









			if (skb->ip_summed == CHECKSUM_PARTIAL)









				len_stat |= DMA_TX_DO_CSUM;









		}