Commit 34c36f45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) Validate tunnel options length in act_tunnel_key, from Xin Long.

 2) Fix DMA sync bug in gve driver, from Adi Suresh.

 3) TSO kills performance on some r8169 chips due to HW issues, disable
    by default in that case, from Corinna Vinschen.

 4) Fix clock disable mismatch in fec driver, from Chubong Yuan.

 5) Fix interrupt status bits define in hns3 driver, from Huazhong Tan.

 6) Fix workqueue deadlocks in qeth driver, from Julian Wiedmann.

 7) Don't napi_disable() twice in r8152 driver, from Hayes Wang.

 8) Fix SKB extension memory leak, from Florian Westphal.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (54 commits)
  r8152: avoid to call napi_disable twice
  MAINTAINERS: Add myself as maintainer of virtio-vsock
  udp: drop skb extensions before marking skb stateless
  net: rtnetlink: prevent underflows in do_setvfinfo()
  can: m_can_platform: remove unnecessary m_can_class_resume() call
  can: m_can_platform: set net_device structure as driver data
  hv_netvsc: Fix send_table offset in case of a host bug
  hv_netvsc: Fix offset usage in netvsc_send_table()
  net-ipv6: IPV6_TRANSPARENT - check NET_RAW prior to NET_ADMIN
  sfc: Only cancel the PPS workqueue if it exists
  nfc: port100: handle command failure cleanly
  net-sysfs: fix netdev_queue_add_kobject() breakage
  r8152: Re-order napi_disable in rtl8152_close
  net: qca_spi: Move reset_count to struct qcaspi
  net: qca_spi: fix receive buffer size check
  net/ibmvnic: Ignore H_FUNCTION return from H_EOI to tolerate XIVE mode
  Revert "net/ibmvnic: Fix EOI when running in XIVE mode"
  net/mlxfw: Verify FSM error code translation doesn't exceed array size
  net/mlx5: Update the list of the PCI supported devices
  net/mlx5: Fix auto group size calculation
  ...
parents b485275f 5b1d9c17

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ F: drivers/net/ethernet/alacritech/* 














FORCEDETH GIGABIT ETHERNET DRIVER















M:	Rain River <rain.1986.08.12@gmail.com>













M:	Zhu Yanjun <yanjun.zhu@oracle.com>













M:	Zhu Yanjun <zyjzyj2000@gmail.com>















L:	netdev@vger.kernel.org















S:	Maintained















F:	drivers/net/ethernet/nvidia/*










@@ -17215,6 +17215,7 @@ F:	virt/lib/



























VIRTIO AND VHOST VSOCK DRIVER















M:	Stefan Hajnoczi <stefanha@redhat.com>













M:	Stefano Garzarella <sgarzare@redhat.com>















L:	kvm@vger.kernel.org















L:	virtualization@lists.linux-foundation.org















L:	netdev@vger.kernel.org

































drivers/net/can/m_can/m_can_platform.c



+1
−3






























Original line number
Diff line number
Diff line








@@ -107,7 +107,7 @@ static int m_can_plat_probe(struct platform_device *pdev)





























	mcan_class->is_peripheral = false;





























	platform_set_drvdata(pdev, mcan_class->dev);













	platform_set_drvdata(pdev, mcan_class->net);































	m_can_init_ram(mcan_class);


























@@ -166,8 +166,6 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev)













	if (err)















		clk_disable_unprepare(mcan_class->hclk);





























	m_can_class_resume(dev);





























	return err;















}

















































drivers/net/ethernet/freescale/fec_main.c



+11
−4






























Original line number
Diff line number
Diff line








@@ -3636,6 +3636,11 @@ fec_drv_remove(struct platform_device *pdev)













	struct net_device *ndev = platform_get_drvdata(pdev);















	struct fec_enet_private *fep = netdev_priv(ndev);















	struct device_node *np = pdev->dev.of_node;













	int ret;



























	ret = pm_runtime_get_sync(&pdev->dev);













	if (ret < 0)













		return ret;































	cancel_work_sync(&fep->tx_timeout_work);















	fec_ptp_stop(pdev);









@@ -3643,15 +3648,17 @@ fec_drv_remove(struct platform_device *pdev)













	fec_enet_mii_remove(fep);















	if (fep->reg_phy)















		regulator_disable(fep->reg_phy);













	pm_runtime_put(&pdev->dev);













	pm_runtime_disable(&pdev->dev);













	clk_disable_unprepare(fep->clk_ahb);













	clk_disable_unprepare(fep->clk_ipg);





























	if (of_phy_is_fixed_link(np))















		of_phy_deregister_fixed_link(np);















	of_node_put(fep->phy_node);















	free_netdev(ndev);





























	clk_disable_unprepare(fep->clk_ahb);













	clk_disable_unprepare(fep->clk_ipg);













	pm_runtime_put_noidle(&pdev->dev);













	pm_runtime_disable(&pdev->dev);





























	return 0;















}

















































drivers/net/ethernet/google/gve/gve_tx.c



+5
−4






























Original line number
Diff line number
Diff line








@@ -393,12 +393,13 @@ static void gve_tx_fill_seg_desc(union gve_tx_desc *seg_desc,













static void gve_dma_sync_for_device(struct device *dev, dma_addr_t *page_buses,















				    u64 iov_offset, u64 iov_len)















{













	u64 last_page = (iov_offset + iov_len - 1) / PAGE_SIZE;













	u64 first_page = iov_offset / PAGE_SIZE;















	dma_addr_t dma;













	u64 addr;













	u64 page;





























	for (addr = iov_offset; addr < iov_offset + iov_len;













	     addr += PAGE_SIZE) {













		dma = page_buses[addr / PAGE_SIZE];













	for (page = first_page; page <= last_page; page++) {













		dma = page_buses[page];















		dma_sync_single_for_device(dev, dma, PAGE_SIZE, DMA_TO_DEVICE);















	}















}

































drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -166,7 +166,7 @@ enum HLCGE_PORT_TYPE {













#define HCLGE_GLOBAL_RESET_BIT		0















#define HCLGE_CORE_RESET_BIT		1















#define HCLGE_IMP_RESET_BIT		2













#define HCLGE_RESET_INT_M		GENMASK(2, 0)













#define HCLGE_RESET_INT_M		GENMASK(7, 5)















#define HCLGE_FUN_RST_ING		0x20C00















#define HCLGE_FUN_RST_ING_B		0

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE