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

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

Pull more networking fixes from Jakub Kicinski
 "Big chunk of fixes for WiFi, Johannes says probably the last for the
  release.

  The Netlink fixes (on top of the tree) restore operation of iw (WiFi
  CLI) which uses sillily small recv buffer, and is the reason for this
  'emergency PR'.

  The GRE multicast fix also stands out among the user-visible
  regressions.

  Current release - fix to a fix:

   - netlink: make sure we always allow at least one skb to be queued,
     even if the recvbuf is (mis)configured to be tiny

  Previous releases - regressions:

   - gre: fix IPv6 multicast route creation

  Previous releases - always broken:

   - wifi: prevent A-MSDU attacks in mesh networks

   - wifi: cfg80211: fix S1G beacon head validation and detection

   - wifi: mac80211:
       - always clear frame buffer to prevent stack leak in cases which
         hit a WARN()
       - fix monitor interface in device restart

   - wifi: mwifiex: discard erroneous disassoc frames on STA interface

   - wifi: mt76:
       - prevent null-deref in mt7925_sta_set_decap_offload()
       - add missing RCU annotations, and fix sleep in atomic
       - fix decapsulation offload
       - fixes for scanning

   - phy: microchip: improve link establishment and reset handling

   - eth: mlx5e: fix race between DIM disable and net_dim()

   - bnxt_en: correct DMA unmap len for XDP_REDIRECT"

* tag 'net-6.16-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (44 commits)
  netlink: make sure we allow at least one dump skb
  netlink: Fix rmem check in netlink_broadcast_deliver().
  bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT
  bnxt_en: Flush FW trace before copying to the coredump
  bnxt_en: Fix DCB ETS validation
  net: ll_temac: Fix missing tx_pending check in ethtools_set_ringparam()
  net/mlx5e: Add new prio for promiscuous mode
  net/mlx5e: Fix race between DIM disable and net_dim()
  net/mlx5: Reset bw_share field when changing a node's parent
  can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level
  selftests: net: lib: fix shift count out of range
  selftests: Add IPv6 multicast route generation tests for GRE devices.
  gre: Fix IPv6 multicast route creation.
  net: phy: microchip: limit 100M workaround to link-down events on LAN88xx
  net: phy: microchip: Use genphy_soft_reset() to purge stale LPA bits
  ibmvnic: Fix hardcoded NUM_RX_STATS/NUM_TX_STATS with dynamic sizeof
  net: appletalk: Fix device refcount leak in atrtr_create()
  netfilter: flowtable: account for Ethernet header in nf_flow_pppoe_proto()
  wifi: mac80211: add the virtual monitor after reconfig complete
  wifi: mac80211: always initialize sdata::key_list
  ...
parents 5265593a a215b572

drivers/net/can/m_can/m_can.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int m_can_handle_lost_msg(struct net_device *dev) 
	struct can_frame *frame;

	u32 timestamp = 0;



	netdev_err(dev, "msg lost in rxf0\n");

	netdev_dbg(dev, "msg lost in rxf0\n");



	stats->rx_errors++;

	stats->rx_over_errors++;

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

+11 −7
Original line number Diff line number Diff line
@@ -368,23 +368,27 @@ static u32 bnxt_get_ctx_coredump(struct bnxt *bp, void *buf, u32 offset, 
		if (!ctxm->mem_valid || !seg_id)

			continue;



		if (trace)

		if (trace) {

			extra_hlen = BNXT_SEG_RCD_LEN;

			if (buf) {

				u16 trace_type = bnxt_bstore_to_trace[type];



				bnxt_fill_drv_seg_record(bp, &record, ctxm,

							 trace_type);

			}

		}



		if (buf)

			data = buf + BNXT_SEG_HDR_LEN + extra_hlen;



		seg_len = bnxt_copy_ctx_mem(bp, ctxm, data, 0) + extra_hlen;

		if (buf) {

			bnxt_fill_coredump_seg_hdr(bp, &seg_hdr, NULL, seg_len,

						   0, 0, 0, comp_id, seg_id);

			memcpy(buf, &seg_hdr, BNXT_SEG_HDR_LEN);

			buf += BNXT_SEG_HDR_LEN;

			if (trace) {

				u16 trace_type = bnxt_bstore_to_trace[type];



				bnxt_fill_drv_seg_record(bp, &record, ctxm,

							 trace_type);

			if (trace)

				memcpy(buf, &record, BNXT_SEG_RCD_LEN);

			}

			buf += seg_len;

		}

		len += BNXT_SEG_HDR_LEN + seg_len;

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

+2 −0
Original line number Diff line number Diff line
@@ -487,7 +487,9 @@ static int bnxt_ets_validate(struct bnxt *bp, struct ieee_ets *ets, u8 *tc) 


		if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) && i > bp->max_tc)

			return -EINVAL;

	}



	for (i = 0; i < max_tc; i++) {

		switch (ets->tc_tsa[i]) {

		case IEEE_8021QAZ_TSA_STRICT:

			break;

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void __bnxt_xmit_xdp_redirect(struct bnxt *bp, 
	tx_buf->action = XDP_REDIRECT;

	tx_buf->xdpf = xdpf;

	dma_unmap_addr_set(tx_buf, mapping, mapping);

	dma_unmap_len_set(tx_buf, len, 0);

	dma_unmap_len_set(tx_buf, len, len);

}



void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)

drivers/net/ethernet/ibm/ibmvnic.h

+6 −2
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ struct ibmvnic_statistics { 
	u8 reserved[72];

} __packed __aligned(8);



#define NUM_TX_STATS 3

struct ibmvnic_tx_queue_stats {

	u64 batched_packets;

	u64 direct_packets;
@@ -219,13 +218,18 @@ struct ibmvnic_tx_queue_stats { 
	u64 dropped_packets;

};



#define NUM_RX_STATS 3

#define NUM_TX_STATS \

	(sizeof(struct ibmvnic_tx_queue_stats) / sizeof(u64))



struct ibmvnic_rx_queue_stats {

	u64 packets;

	u64 bytes;

	u64 interrupts;

};



#define NUM_RX_STATS \

	(sizeof(struct ibmvnic_rx_queue_stats) / sizeof(u64))



struct ibmvnic_acl_buffer {

	__be32 len;

	__be32 version;