Commit 27bbf45e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - bpf: adjust size_index according to the value of KMALLOC_MIN_SIZE

   - netfilter: fix entries val in rule reset audit log

   - eth: stmmac: fix incorrect rxq|txq_stats reference

  Previous releases - regressions:

   - ipv4: fix null-deref in ipv4_link_failure

   - netfilter:
      - fix several GC related issues
      - fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP

   - eth: team: fix null-ptr-deref when team device type is changed

   - eth: i40e: fix VF VLAN offloading when port VLAN is configured

   - eth: ionic: fix 16bit math issue when PAGE_SIZE >= 64KB

  Previous releases - always broken:

   - core: fix ETH_P_1588 flow dissector

   - mptcp: fix several connection hang-up conditions

   - bpf:
      - avoid deadlock when using queue and stack maps from NMI
      - add override check to kprobe multi link attach

   - hsr: properly parse HSRv1 supervisor frames.

   - eth: igc: fix infinite initialization loop with early XDP redirect

   - eth: octeon_ep: fix tx dma unmap len values in SG

   - eth: hns3: fix GRE checksum offload issue"

* tag 'net-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (87 commits)
  sfc: handle error pointers returned by rhashtable_lookup_get_insert_fast()
  igc: Expose tx-usecs coalesce setting to user
  octeontx2-pf: Do xdp_do_flush() after redirects.
  bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI
  net: ena: Flush XDP packets on error.
  net/handshake: Fix memory leak in __sock_create() and sock_alloc_file()
  net: hinic: Fix warning-hinic_set_vlan_fliter() warn: variable dereferenced before check 'hwdev'
  netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
  netfilter: nf_tables: fix memleak when more than 255 elements expired
  netfilter: nf_tables: disable toggling dormant table state more than once
  vxlan: Add missing entries to vxlan_get_size()
  net: rds: Fix possible NULL-pointer dereference
  team: fix null-ptr-deref when team device type is changed
  net: bridge: use DEV_STATS_INC()
  net: hns3: add 5ms delay before clear firmware reset irq source
  net: hns3: fix fail to delete tc flower rules during reset issue
  net: hns3: only enable unicast promisc when mac table full
  net: hns3: fix GRE checksum offload issue
  net: hns3: add cmdq check for vf periodic service task
  net: stmmac: fix incorrect rxq|txq_stats reference
  ...
parents b5cbe7c0 ecf43926

Documentation/networking/ax25.rst

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ AX.25 
To use the amateur radio protocols within Linux you will need to get a

suitable copy of the AX.25 Utilities. More detailed information about

AX.25, NET/ROM and ROSE, associated programs and utilities can be

found on http://www.linux-ax25.org.

found on https://linux-ax25.in-berlin.de.



There is an active mailing list for discussing Linux amateur radio matters

There is a mailing list for discussing Linux amateur radio matters

called linux-hams@vger.kernel.org. To subscribe to it, send a message to

majordomo@vger.kernel.org with the words "subscribe linux-hams" in the body

of the message, the subject field is ignored.  You don't need to be

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -3344,7 +3344,7 @@ AX.25 NETWORK LAYER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org

S:	Maintained

W:	http://www.linux-ax25.org/

W:	https://linux-ax25.in-berlin.de

F:	include/net/ax25.h

F:	include/uapi/linux/ax25.h

F:	net/ax25/
@@ -14756,7 +14756,7 @@ NETROM NETWORK LAYER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org

S:	Maintained

W:	http://www.linux-ax25.org/

W:	https://linux-ax25.in-berlin.de

F:	include/net/netrom.h

F:	include/uapi/linux/netrom.h

F:	net/netrom/
@@ -18607,7 +18607,7 @@ ROSE NETWORK LAYER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org

S:	Maintained

W:	http://www.linux-ax25.org/

W:	https://linux-ax25.in-berlin.de

F:	include/net/rose.h

F:	include/uapi/linux/rose.h

F:	net/rose/

drivers/net/ethernet/amazon/ena/ena_netdev.c

+3 −0
Original line number Diff line number Diff line
@@ -1833,6 +1833,9 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, 
	return work_done;



error:

	if (xdp_flags & ENA_XDP_REDIRECT)

		xdp_do_flush();



	adapter = netdev_priv(rx_ring->netdev);



	if (rc == -ENOSPC) {

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

+5 −0
Original line number Diff line number Diff line
@@ -2614,6 +2614,7 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget) 
	struct rx_cmp_ext *rxcmp1;

	u32 cp_cons, tmp_raw_cons;

	u32 raw_cons = cpr->cp_raw_cons;

	bool flush_xdp = false;

	u32 rx_pkts = 0;

	u8 event = 0;
@@ -2648,6 +2649,8 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget) 
				rx_pkts++;

			else if (rc == -EBUSY)	/* partial completion */

				break;

			if (event & BNXT_REDIRECT_EVENT)

				flush_xdp = true;

		} else if (unlikely(TX_CMP_TYPE(txcmp) ==

				    CMPL_BASE_TYPE_HWRM_DONE)) {

			bnxt_hwrm_handler(bp, txcmp);
@@ -2667,6 +2670,8 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget) 


	if (event & BNXT_AGG_EVENT)

		bnxt_db_write(bp, &rxr->rx_agg_db, rxr->rx_agg_prod);

	if (flush_xdp)

		xdp_do_flush();



	if (!bnxt_has_work(bp, cpr) && rx_pkts < budget) {

		napi_complete_done(napi, rx_pkts);

drivers/net/ethernet/engleder/tsnep_ethtool.c

+2 −4
Original line number Diff line number Diff line
@@ -300,10 +300,8 @@ static void tsnep_ethtool_get_channels(struct net_device *netdev, 
{

	struct tsnep_adapter *adapter = netdev_priv(netdev);



	ch->max_rx = adapter->num_rx_queues;

	ch->max_tx = adapter->num_tx_queues;

	ch->rx_count = adapter->num_rx_queues;

	ch->tx_count = adapter->num_tx_queues;

	ch->max_combined = adapter->num_queues;

	ch->combined_count = adapter->num_queues;

}



static int tsnep_ethtool_get_ts_info(struct net_device *netdev,