Commit 551acdc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  A few last minute revert / disable and fix patches came down from our
  sub-trees. We're not waiting for any fixes at this point.

  Current release - regressions:

   - Revert "netfilter: nat: force port remap to prevent shadowing
     well-known ports", restore working conntrack on asymmetric paths

   - Revert "ath10k: drop beacon and probe response which leak from
     other channel", restore working AP and mesh mode on QCA9984

   - eth: intel: fix hang during reboot/shutdown

  Current release - new code bugs:

   - netfilter: nf_tables: disable register tracking, it needs more work
     to cover all corner cases

  Previous releases - regressions:

   - ipv6: fix skb_over_panic in __ip6_append_data when (admin-only)
     extension headers get specified

   - esp6: fix ESP over TCP/UDP, interpret ipv6_skip_exthdr's return
     value more selectively

   - bnx2x: fix driver load failure when FW not present in initrd

  Previous releases - always broken:

   - vsock: stop destroying unrelated sockets in nested virtualization

   - packet: fix slab-out-of-bounds access in packet_recvmsg()

  Misc:

   - add Paolo Abeni to networking maintainers!"

* tag 'net-5.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (26 commits)
  iavf: Fix hang during reboot/shutdown
  net: mscc: ocelot: fix backwards compatibility with single-chain tc-flower offload
  net: bcmgenet: skip invalid partial checksums
  bnx2x: fix built-in kernel driver load failure
  net: phy: mscc: Add MODULE_FIRMWARE macros
  net: dsa: Add missing of_node_put() in dsa_port_parse_of
  net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit()
  Revert "ath10k: drop beacon and probe response which leak from other channel"
  hv_netvsc: Add check for kvmalloc_array
  iavf: Fix double free in iavf_reset_task
  ice: destroy flow director filter mutex after releasing VSIs
  ice: fix NULL pointer dereference in ice_update_vsi_tx_ring_stats()
  Add Paolo Abeni to networking maintainers
  atm: eni: Add check for dma_map_single
  net/packet: fix slab-out-of-bounds access in packet_recvmsg()
  net: mdio: mscc-miim: fix duplicate debugfs entry
  net: phy: marvell: Fix invalid comparison in the resume and suspend functions
  esp6: fix check on ipv6_skip_exthdr's return value
  net: dsa: microchip: add spi_device_id tables
  netfilter: nf_tables: disable register tracking
  ...
parents c81801eb b04683ff

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -13376,6 +13376,7 @@ F: net/core/drop_monitor.c 
NETWORKING DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

M:	Jakub Kicinski <kuba@kernel.org>

M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/netdevbpf/list/
@@ -13422,6 +13423,7 @@ F: tools/testing/selftests/drivers/net/dsa/ 
NETWORKING [GENERAL]

M:	"David S. Miller" <davem@davemloft.net>

M:	Jakub Kicinski <kuba@kernel.org>

M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/netdevbpf/list/

drivers/atm/eni.c

+2 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,8 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags); 
	skb_data3 = skb->data[3];

	paddr = dma_map_single(&eni_dev->pci_dev->dev,skb->data,skb->len,

			       DMA_TO_DEVICE);

	if (dma_mapping_error(&eni_dev->pci_dev->dev, paddr))

		return enq_next;

	ENI_PRV_PADDR(skb) = paddr;

	/* prepare DMA queue entries */

	j = 0;

drivers/net/dsa/microchip/ksz8795_spi.c

+11 −0
Original line number Diff line number Diff line
@@ -124,12 +124,23 @@ static const struct of_device_id ksz8795_dt_ids[] = { 
};

MODULE_DEVICE_TABLE(of, ksz8795_dt_ids);



static const struct spi_device_id ksz8795_spi_ids[] = {

	{ "ksz8765" },

	{ "ksz8794" },

	{ "ksz8795" },

	{ "ksz8863" },

	{ "ksz8873" },

	{ },

};

MODULE_DEVICE_TABLE(spi, ksz8795_spi_ids);



static struct spi_driver ksz8795_spi_driver = {

	.driver = {

		.name	= "ksz8795-switch",

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(ksz8795_dt_ids),

	},

	.id_table = ksz8795_spi_ids,

	.probe	= ksz8795_spi_probe,

	.remove	= ksz8795_spi_remove,

	.shutdown = ksz8795_spi_shutdown,

drivers/net/dsa/microchip/ksz9477_spi.c

+12 −0
Original line number Diff line number Diff line
@@ -98,12 +98,24 @@ static const struct of_device_id ksz9477_dt_ids[] = { 
};

MODULE_DEVICE_TABLE(of, ksz9477_dt_ids);



static const struct spi_device_id ksz9477_spi_ids[] = {

	{ "ksz9477" },

	{ "ksz9897" },

	{ "ksz9893" },

	{ "ksz9563" },

	{ "ksz8563" },

	{ "ksz9567" },

	{ },

};

MODULE_DEVICE_TABLE(spi, ksz9477_spi_ids);



static struct spi_driver ksz9477_spi_driver = {

	.driver = {

		.name	= "ksz9477-switch",

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(ksz9477_dt_ids),

	},

	.id_table = ksz9477_spi_ids,

	.probe	= ksz9477_spi_probe,

	.remove	= ksz9477_spi_remove,

	.shutdown = ksz9477_spi_shutdown,

drivers/net/ethernet/atheros/alx/main.c

+4 −1
Original line number Diff line number Diff line
@@ -1181,8 +1181,11 @@ static int alx_change_mtu(struct net_device *netdev, int mtu) 
	alx->hw.mtu = mtu;

	alx->rxbuf_size = max(max_frame, ALX_DEF_RXBUF_SIZE);

	netdev_update_features(netdev);

	if (netif_running(netdev))

	if (netif_running(netdev)) {

		mutex_lock(&alx->mtx);

		alx_reinit(alx);

		mutex_unlock(&alx->mtx);

	}

	return 0;

}