Commit f0936155 authored Aug 03, 2016 by Linus Torvalds

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

Pull networking fixes from David Miller:

 1) Fix several cases of missing of_node_put() calls in various
    networking drivers.  From Peter Chen.

 2) Don't try to remove unconfigured VLANs in qed driver, from Yuval
    Mintz.

 3) Unbalanced locking in TIPC error handling, from Wei Yongjun.

 4) Fix lockups in CPDMA driver, from Grygorii Strashko.

 5) More MACSEC refcount et al fixes, from Sabrina Dubroca.

 6) Fix MAC address setting in r8169 during runtime suspend, from
    Chun-Hao Lin.

 7) Various printf format specifier fixes, from Heinrich Schuchardt.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (59 commits)
  qed: Fail driver load in 100g MSI mode.
  ethernet: ti: davinci_emac: add missing of_node_put after calling of_parse_phandle
  ethernet: stmicro: stmmac: add missing of_node_put after calling of_parse_phandle
  ethernet: stmicro: stmmac: dwmac-socfpga: add missing of_node_put after calling of_parse_phandle
  ethernet: renesas: sh_eth: add missing of_node_put after calling of_parse_phandle
  ethernet: renesas: ravb_main: add missing of_node_put after calling of_parse_phandle
  ethernet: marvell: pxa168_eth: add missing of_node_put after calling of_parse_phandle
  ethernet: marvell: mvpp2: add missing of_node_put after calling of_parse_phandle
  ethernet: marvell: mvneta: add missing of_node_put after calling of_parse_phandle
  ethernet: hisilicon: hns: hns_dsaf_main: add missing of_node_put after calling of_parse_phandle
  ethernet: hisilicon: hns: hns_dsaf_mac: add missing of_node_put after calling of_parse_phandle
  ethernet: cavium: octeon: add missing of_node_put after calling of_parse_phandle
  ethernet: aurora: nb8800: add missing of_node_put after calling of_parse_phandle
  ethernet: arc: emac_main: add missing of_node_put after calling of_parse_phandle
  ethernet: apm: xgene: add missing of_node_put after calling of_parse_phandle
  ethernet: altera: add missing of_node_put
  8139too: fix system hang when there is a tx timeout event.
  qed: Fix error return code in qed_resc_alloc()
  net: qlcnic: avoid superfluous assignement
  dsa: b53: remove redundant if
  ...

parents d52bd54d 1d2c2024

arch/arm/mach-omap2/omap_device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ static int _omap_device_notifier_call(struct notifier_block *nb,
		int err;

		switch (event) {
		case BUS_NOTIFY_DEL_DEVICE:
		case BUS_NOTIFY_REMOVED_DEVICE:
		if (pdev->archdata.od)
		omap_device_delete(pdev->archdata.od);
		break;

drivers/net/caif/caif_spi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -185,8 +185,8 @@ static ssize_t print_frame(char buf, size_t size, char frm,
		/* Fast forward. */
		i = count - cut;
		len += snprintf((buf + len), (size - len),
		"--- %u bytes skipped ---\n",
		(int)(count - (cut * 2)));
		"--- %zu bytes skipped ---\n",
		count - (cut * 2));
		}

		if ((!(i % 10)) && i) {

drivers/net/dsa/b53/b53_mmap.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -233,7 +233,6 @@ static int b53_mmap_probe(struct platform_device *pdev)
		if (!dev)
		return -ENOMEM;

		if (pdata)
		dev->pdata = pdata;

		platform_set_drvdata(pdev, dev);

drivers/net/dsa/bcm_sf2.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1622,7 +1622,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
		"switch_0", priv);
		if (ret < 0) {
		pr_err("failed to request switch_0 IRQ\n");
		goto out_unmap;
		goto out_mdio;
		}

		ret = request_irq(priv->irq1, bcm_sf2_switch_1_isr, 0,
		@@ -1679,6 +1679,8 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)

		out_free_irq0:
		free_irq(priv->irq0, priv);
		out_mdio:
		bcm_sf2_mdio_unregister(priv);
		out_unmap:
		base = &priv->core;
		for (i = 0; i < BCM_SF2_REGS_NUM; i++) {
		@@ -1686,7 +1688,6 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
		iounmap(*base);
		base++;
		}
		bcm_sf2_mdio_unregister(priv);
		return ret;
		}

drivers/net/ethernet/8390/ax88796.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -910,6 +910,7 @@ static int ax_probe(struct platform_device *pdev)
		iounmap(ax->map2);

		exit_mem2:
		if (mem2)
		release_mem_region(mem2->start, mem2_size);

		exit_mem1: