Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050cdc6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) ICE, E1000, IGB, IXGBE, and I40E bug fixes from the Intel folks.

 2) Better fix for AB-BA deadlock in packet scheduler code, from Cong
    Wang.

 3) bpf sockmap fixes (zero sized key handling, etc.) from Daniel
    Borkmann.

 4) Send zero IPID in TCP resets and SYN-RECV state ACKs, to prevent
    attackers using it as a side-channel. From Eric Dumazet.

 5) Memory leak in mediatek bluetooth driver, from Gustavo A. R. Silva.

 6) Hook up rt->dst.input of ipv6 anycast routes properly, from Hangbin
    Liu.

 7) hns and hns3 bug fixes from Huazhong Tan.

 8) Fix RIF leak in mlxsw driver, from Ido Schimmel.

 9) iova range check fix in vhost, from Jason Wang.

10) Fix hang in do_tcp_sendpages() with tls, from John Fastabend.

11) More r8152 chips need to disable RX aggregation, from Kai-Heng Feng.

12) Memory exposure in TCA_U32_SEL handling, from Kees Cook.

13) TCP BBR congestion control fixes from Kevin Yang.

14) hv_netvsc, ignore non-PCI devices, from Stephen Hemminger.

15) qed driver fixes from Tomer Tayar.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (77 commits)
  net: sched: Fix memory exposure from short TCA_U32_SEL
  qed: fix spelling mistake "comparsion" -> "comparison"
  vhost: correctly check the iova range when waking virtqueue
  qlge: Fix netdev features configuration.
  net: macb: do not disable MDIO bus at open/close time
  Revert "net: stmmac: fix build failure due to missing COMMON_CLK dependency"
  net: macb: Fix regression breaking non-MDIO fixed-link PHYs
  mlxsw: spectrum_switchdev: Do not leak RIFs when removing bridge
  i40e: fix condition of WARN_ONCE for stat strings
  i40e: Fix for Tx timeouts when interface is brought up if DCB is enabled
  ixgbe: fix driver behaviour after issuing VFLR
  ixgbe: Prevent unsupported configurations with XDP
  ixgbe: Replace GFP_ATOMIC with GFP_KERNEL
  igb: Replace mdelay() with msleep() in igb_integrated_phy_loopback()
  igb: Replace GFP_ATOMIC with GFP_KERNEL in igb_sw_init()
  igb: Use an advanced ctx descriptor for launchtime
  e1000: ensure to free old tx/rx rings in set_ringparam()
  e1000: check on netif_running() before calling e1000_up()
  ixgb: use dma_zalloc_coherent instead of allocator/memset
  ice: Trivial formatting fixes
  ...
parents 908946c4 98c8f125

drivers/bluetooth/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ config BT_HCIUART_RTL 
	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	depends on GPIOLIB

	depends on ACPI

	select BT_HCIUART_3WIRE

	select BT_RTL

	help

drivers/bluetooth/btmtkuart.c

+5 −3
Original line number Diff line number Diff line
@@ -144,8 +144,10 @@ static int mtk_setup_fw(struct hci_dev *hdev) 
	fw_size = fw->size;



	/* The size of patch header is 30 bytes, should be skip */

	if (fw_size < 30)

		return -EINVAL;

	if (fw_size < 30) {

		err = -EINVAL;

		goto free_fw;

	}



	fw_size -= 30;

	fw_ptr += 30;
@@ -172,8 +174,8 @@ static int mtk_setup_fw(struct hci_dev *hdev) 
		fw_ptr += dlen;

	}



free_fw:

	release_firmware(fw);



	return err;

}

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

+2 −4
Original line number Diff line number Diff line
@@ -110,16 +110,14 @@ static int bnxt_tc_parse_actions(struct bnxt *bp, 
				 struct tcf_exts *tc_exts)

{

	const struct tc_action *tc_act;

	LIST_HEAD(tc_actions);

	int rc;

	int i, rc;



	if (!tcf_exts_has_actions(tc_exts)) {

		netdev_info(bp->dev, "no actions");

		return -EINVAL;

	}



	tcf_exts_to_list(tc_exts, &tc_actions);

	list_for_each_entry(tc_act, &tc_actions, list) {

	tcf_exts_for_each_action(i, tc_act, tc_exts) {

		/* Drop action */

		if (is_tcf_gact_shot(tc_act)) {

			actions->flags |= BNXT_TC_ACTION_FLAG_DROP;

drivers/net/ethernet/cadence/macb_main.c

+23 −13
Original line number Diff line number Diff line
@@ -482,11 +482,6 @@ static int macb_mii_probe(struct net_device *dev) 


	if (np) {

		if (of_phy_is_fixed_link(np)) {

			if (of_phy_register_fixed_link(np) < 0) {

				dev_err(&bp->pdev->dev,

					"broken fixed-link specification\n");

				return -ENODEV;

			}

			bp->phy_node = of_node_get(np);

		} else {

			bp->phy_node = of_parse_phandle(np, "phy-handle", 0);
@@ -569,7 +564,7 @@ static int macb_mii_init(struct macb *bp) 
{

	struct macb_platform_data *pdata;

	struct device_node *np;

	int err;

	int err = -ENXIO;



	/* Enable management port */

	macb_writel(bp, NCR, MACB_BIT(MPE));
@@ -592,12 +587,23 @@ static int macb_mii_init(struct macb *bp) 
	dev_set_drvdata(&bp->dev->dev, bp->mii_bus);



	np = bp->pdev->dev.of_node;

	if (np && of_phy_is_fixed_link(np)) {

		if (of_phy_register_fixed_link(np) < 0) {

			dev_err(&bp->pdev->dev,

				"broken fixed-link specification %pOF\n", np);

			goto err_out_free_mdiobus;

		}



		err = mdiobus_register(bp->mii_bus);

	} else {

		if (pdata)

			bp->mii_bus->phy_mask = pdata->phy_mask;



		err = of_mdiobus_register(bp->mii_bus, np);

	}



	if (err)

		goto err_out_free_mdiobus;

		goto err_out_free_fixed_link;



	err = macb_mii_probe(bp->dev);

	if (err)
@@ -607,6 +613,7 @@ static int macb_mii_init(struct macb *bp) 


err_out_unregister_bus:

	mdiobus_unregister(bp->mii_bus);

err_out_free_fixed_link:

	if (np && of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

err_out_free_mdiobus:
@@ -2028,14 +2035,17 @@ static void macb_reset_hw(struct macb *bp) 
{

	struct macb_queue *queue;

	unsigned int q;

	u32 ctrl = macb_readl(bp, NCR);



	/* Disable RX and TX (XXX: Should we halt the transmission

	 * more gracefully?)

	 */

	macb_writel(bp, NCR, 0);

	ctrl &= ~(MACB_BIT(RE) | MACB_BIT(TE));



	/* Clear the stats registers (XXX: Update stats first?) */

	macb_writel(bp, NCR, MACB_BIT(CLRSTAT));

	ctrl |= MACB_BIT(CLRSTAT);



	macb_writel(bp, NCR, ctrl);



	/* Clear all status flags */

	macb_writel(bp, TSR, -1);
@@ -2223,7 +2233,7 @@ static void macb_init_hw(struct macb *bp) 
	}



	/* Enable TX and RX */

	macb_writel(bp, NCR, MACB_BIT(RE) | MACB_BIT(TE) | MACB_BIT(MPE));

	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE));

}



/* The hash address register is 64 bits long and takes up two

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+4 −6
Original line number Diff line number Diff line
@@ -417,10 +417,9 @@ static void cxgb4_process_flow_actions(struct net_device *in, 
				       struct ch_filter_specification *fs)

{

	const struct tc_action *a;

	LIST_HEAD(actions);

	int i;



	tcf_exts_to_list(cls->exts, &actions);

	list_for_each_entry(a, &actions, list) {

	tcf_exts_for_each_action(i, a, cls->exts) {

		if (is_tcf_gact_ok(a)) {

			fs->action = FILTER_PASS;

		} else if (is_tcf_gact_shot(a)) {
@@ -591,10 +590,9 @@ static int cxgb4_validate_flow_actions(struct net_device *dev, 
	bool act_redir = false;

	bool act_pedit = false;

	bool act_vlan = false;

	LIST_HEAD(actions);

	int i;



	tcf_exts_to_list(cls->exts, &actions);

	list_for_each_entry(a, &actions, list) {

	tcf_exts_for_each_action(i, a, cls->exts) {

		if (is_tcf_gact_ok(a)) {

			/* Do nothing */

		} else if (is_tcf_gact_shot(a)) {