kernel: bump kernel 4.4 to 4.4.135 for 17.01

* Refreshed patches

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

26 files changed, 122 insertions, 122 deletions

diff --git a/target/linux/generic/patches-4.4/070-v4.6-0001-bgmac-add-helper-checking-for-BCM4707-BCM53018-chip-.patch b/target/linux/generic/patches-4.4/070-v4.6-0001-bgmac-add-helper-checking-for-BCM4707-BCM53018-chip-.patch
index 94a37d4437..1847e3bfa6 100644
--- a/target/linux/generic/patches-4.4/070-v4.6-0001-bgmac-add-helper-checking-for-BCM4707-BCM53018-chip-.patch
+++ b/target/linux/generic/patches-4.4/070-v4.6-0001-bgmac-add-helper-checking-for-BCM4707-BCM53018-chip-.patch
@@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static bool bgmac_wait_value(struct bcma_device *core, u16 reg, u32 mask,
  			     u32 value, int timeout)
  {
-@@ -991,11 +1002,9 @@ static void bgmac_mac_speed(struct bgmac
+@@ -992,11 +1003,9 @@ static void bgmac_mac_speed(struct bgmac
  static void bgmac_miiconfig(struct bgmac *bgmac)
  {
  	struct bcma_device *core = bgmac->core;
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bcma_awrite32(core, BCMA_IOCTL,
  			      bcma_aread32(core, BCMA_IOCTL) | 0x40 |
  			      BGMAC_BCMA_IOCTL_SW_CLKEN);
-@@ -1059,9 +1068,7 @@ static void bgmac_chip_reset(struct bgma
+@@ -1060,9 +1069,7 @@ static void bgmac_chip_reset(struct bgma
  	}
  
  	/* Request Misc PLL for corerev > 2 */
@@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bgmac_set(bgmac, BCMA_CLKCTLST,
  			  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
  		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
-@@ -1197,8 +1204,7 @@ static void bgmac_enable(struct bgmac *b
+@@ -1198,8 +1205,7 @@ static void bgmac_enable(struct bgmac *b
  		break;
  	}
  
@@ -70,7 +70,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
  		rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
  		bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) /
-@@ -1477,14 +1483,12 @@ static int bgmac_fixed_phy_register(stru
+@@ -1478,14 +1484,12 @@ static int bgmac_fixed_phy_register(stru
  
  static int bgmac_mii_register(struct bgmac *bgmac)
  {
@@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return bgmac_fixed_phy_register(bgmac);
  
  	mii_bus = mdiobus_alloc();
-@@ -1555,7 +1559,6 @@ static void bgmac_mii_unregister(struct
+@@ -1556,7 +1560,6 @@ static void bgmac_mii_unregister(struct
  /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */
  static int bgmac_probe(struct bcma_device *core)
  {
@@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	struct net_device *net_dev;
  	struct bgmac *bgmac;
  	struct ssb_sprom *sprom = &core->bus->sprom;
-@@ -1641,8 +1644,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1642,8 +1645,7 @@ static int bgmac_probe(struct bcma_devic
  	bgmac_chip_reset(bgmac);
  
  	/* For Northstar, we have to take all GMAC core out of reset */
diff --git a/target/linux/generic/patches-4.4/070-v4.6-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch b/target/linux/generic/patches-4.4/070-v4.6-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
index 41e470b314..3c46af1f61 100644
--- a/target/linux/generic/patches-4.4/070-v4.6-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
+++ b/target/linux/generic/patches-4.4/070-v4.6-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	case BCMA_CHIP_ID_BCM53018:
  		return true;
  	default:
-@@ -1056,8 +1057,9 @@ static void bgmac_chip_reset(struct bgma
+@@ -1057,8 +1058,9 @@ static void bgmac_chip_reset(struct bgma
  	    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
  		iost &= ~BGMAC_BCMA_IOST_ATTACHED;
  
diff --git a/target/linux/generic/patches-4.4/070-v4.8-0001-bgmac-Bind-net_device-with-backing-device-structure.patch b/target/linux/generic/patches-4.4/070-v4.8-0001-bgmac-Bind-net_device-with-backing-device-structure.patch
index 8f6d9a9ee7..4377195b4a 100644
--- a/target/linux/generic/patches-4.4/070-v4.8-0001-bgmac-Bind-net_device-with-backing-device-structure.patch
+++ b/target/linux/generic/patches-4.4/070-v4.8-0001-bgmac-Bind-net_device-with-backing-device-structure.patch
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1604,6 +1604,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1605,6 +1605,7 @@ static int bgmac_probe(struct bcma_devic
  	bgmac->net_dev = net_dev;
  	bgmac->core = core;
  	bcma_set_drvdata(core, bgmac);
diff --git a/target/linux/generic/patches-4.4/070-v4.8-0002-bgmac-Add-support-for-ethtool-statistics.patch b/target/linux/generic/patches-4.4/070-v4.8-0002-bgmac-Add-support-for-ethtool-statistics.patch
index 585282b0aa..777466acb3 100644
--- a/target/linux/generic/patches-4.4/070-v4.8-0002-bgmac-Add-support-for-ethtool-statistics.patch
+++ b/target/linux/generic/patches-4.4/070-v4.8-0002-bgmac-Add-support-for-ethtool-statistics.patch
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1387,6 +1387,127 @@ static const struct net_device_ops bgmac
+@@ -1388,6 +1388,127 @@ static const struct net_device_ops bgmac
   * ethtool_ops
   **************************************************/
  
@@ -143,7 +143,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int bgmac_get_settings(struct net_device *net_dev,
  			      struct ethtool_cmd *cmd)
  {
-@@ -1411,6 +1532,9 @@ static void bgmac_get_drvinfo(struct net
+@@ -1412,6 +1533,9 @@ static void bgmac_get_drvinfo(struct net
  }
  
  static const struct ethtool_ops bgmac_ethtool_ops = {
diff --git a/target/linux/generic/patches-4.4/070-v4.8-0004-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch b/target/linux/generic/patches-4.4/070-v4.8-0004-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
index 7ce6a09ec3..205c1237fb 100644
--- a/target/linux/generic/patches-4.4/070-v4.8-0004-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
+++ b/target/linux/generic/patches-4.4/070-v4.8-0004-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1324,7 +1324,7 @@ static int bgmac_open(struct net_device
+@@ -1325,7 +1325,7 @@ static int bgmac_open(struct net_device
  	}
  	napi_enable(&bgmac->napi);
  
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	netif_start_queue(net_dev);
  
-@@ -1337,7 +1337,7 @@ static int bgmac_stop(struct net_device
+@@ -1338,7 +1338,7 @@ static int bgmac_stop(struct net_device
  
  	netif_carrier_off(net_dev);
  
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	napi_disable(&bgmac->napi);
  	bgmac_chip_intrs_off(bgmac);
-@@ -1375,12 +1375,10 @@ static int bgmac_set_mac_address(struct
+@@ -1376,12 +1376,10 @@ static int bgmac_set_mac_address(struct
  
  static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
  {
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static const struct net_device_ops bgmac_netdev_ops = {
-@@ -1523,7 +1521,7 @@ static int bgmac_get_settings(struct net
+@@ -1524,7 +1522,7 @@ static int bgmac_get_settings(struct net
  {
  	struct bgmac *bgmac = netdev_priv(net_dev);
  
@@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static int bgmac_set_settings(struct net_device *net_dev,
-@@ -1531,7 +1529,7 @@ static int bgmac_set_settings(struct net
+@@ -1532,7 +1530,7 @@ static int bgmac_set_settings(struct net
  {
  	struct bgmac *bgmac = netdev_priv(net_dev);
  
@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void bgmac_get_drvinfo(struct net_device *net_dev,
-@@ -1568,7 +1566,7 @@ static int bgmac_mii_write(struct mii_bu
+@@ -1569,7 +1567,7 @@ static int bgmac_mii_write(struct mii_bu
  static void bgmac_adjust_link(struct net_device *net_dev)
  {
  	struct bgmac *bgmac = netdev_priv(net_dev);
@@ -76,7 +76,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	bool update = false;
  
  	if (phy_dev->link) {
-@@ -1612,8 +1610,6 @@ static int bgmac_fixed_phy_register(stru
+@@ -1613,8 +1611,6 @@ static int bgmac_fixed_phy_register(stru
  		return err;
  	}
  
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	return err;
  }
  
-@@ -1666,7 +1662,6 @@ static int bgmac_mii_register(struct bgm
+@@ -1667,7 +1663,6 @@ static int bgmac_mii_register(struct bgm
  		err = PTR_ERR(phy_dev);
  		goto err_unregister_bus;
  	}
diff --git a/target/linux/generic/patches-4.4/071-v4.8-0001-net-ethernet-bgmac-change-bgmac_-prints-to-dev_-prin.patch b/target/linux/generic/patches-4.4/071-v4.8-0001-net-ethernet-bgmac-change-bgmac_-prints-to-dev_-prin.patch
index 3837b60943..096295d4cf 100644
--- a/target/linux/generic/patches-4.4/071-v4.8-0001-net-ethernet-bgmac-change-bgmac_-prints-to-dev_-prin.patch
+++ b/target/linux/generic/patches-4.4/071-v4.8-0001-net-ethernet-bgmac-change-bgmac_-prints-to-dev_-prin.patch
@@ -140,7 +140,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  				put_page(virt_to_head_page(buf));
  				bgmac->net_dev->stats.rx_errors++;
  				break;
-@@ -644,7 +644,7 @@ static int bgmac_dma_alloc(struct bgmac
+@@ -645,7 +645,7 @@ static int bgmac_dma_alloc(struct bgmac
  	BUILD_BUG_ON(BGMAC_MAX_RX_RINGS > ARRAY_SIZE(ring_base));
  
  	if (!(bcma_aread32(bgmac->core, BCMA_IOST) & BCMA_IOST_DMA64)) {
@@ -149,7 +149,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return -ENOTSUPP;
  	}
  
-@@ -658,8 +658,8 @@ static int bgmac_dma_alloc(struct bgmac
+@@ -659,8 +659,8 @@ static int bgmac_dma_alloc(struct bgmac
  						     &ring->dma_base,
  						     GFP_KERNEL);
  		if (!ring->cpu_base) {
@@ -160,7 +160,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			goto err_dma_free;
  		}
  
-@@ -683,8 +683,8 @@ static int bgmac_dma_alloc(struct bgmac
+@@ -684,8 +684,8 @@ static int bgmac_dma_alloc(struct bgmac
  						     &ring->dma_base,
  						     GFP_KERNEL);
  		if (!ring->cpu_base) {
@@ -171,7 +171,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			err = -ENOMEM;
  			goto err_dma_free;
  		}
-@@ -803,8 +803,8 @@ static u16 bgmac_phy_read(struct bgmac *
+@@ -804,8 +804,8 @@ static u16 bgmac_phy_read(struct bgmac *
  	bcma_write32(core, phy_access_addr, tmp);
  
  	if (!bgmac_wait_value(core, phy_access_addr, BGMAC_PA_START, 0, 1000)) {
@@ -182,7 +182,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return 0xffff;
  	}
  
-@@ -836,7 +836,7 @@ static int bgmac_phy_write(struct bgmac
+@@ -837,7 +837,7 @@ static int bgmac_phy_write(struct bgmac
  
  	bgmac_write(bgmac, BGMAC_INT_STATUS, BGMAC_IS_MDIO);
  	if (bgmac_read(bgmac, BGMAC_INT_STATUS) & BGMAC_IS_MDIO)
@@ -191,7 +191,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	tmp = BGMAC_PA_START;
  	tmp |= BGMAC_PA_WRITE;
-@@ -846,8 +846,8 @@ static int bgmac_phy_write(struct bgmac
+@@ -847,8 +847,8 @@ static int bgmac_phy_write(struct bgmac
  	bcma_write32(core, phy_access_addr, tmp);
  
  	if (!bgmac_wait_value(core, phy_access_addr, BGMAC_PA_START, 0, 1000)) {
@@ -202,7 +202,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return -ETIMEDOUT;
  	}
  
-@@ -900,7 +900,7 @@ static void bgmac_phy_reset(struct bgmac
+@@ -901,7 +901,7 @@ static void bgmac_phy_reset(struct bgmac
  	bgmac_phy_write(bgmac, bgmac->phyaddr, MII_BMCR, BMCR_RESET);
  	udelay(100);
  	if (bgmac_phy_read(bgmac, bgmac->phyaddr, MII_BMCR) & BMCR_RESET)
@@ -211,7 +211,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	bgmac_phy_init(bgmac);
  }
  
-@@ -1001,7 +1001,8 @@ static void bgmac_mac_speed(struct bgmac
+@@ -1002,7 +1002,8 @@ static void bgmac_mac_speed(struct bgmac
  		set |= BGMAC_CMDCFG_ES_2500;
  		break;
  	default:
@@ -221,7 +221,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	if (bgmac->mac_duplex == DUPLEX_HALF)
-@@ -1100,8 +1101,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -1101,8 +1102,8 @@ static void bgmac_chip_reset(struct bgma
  
  		if (bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) {
  			if (kstrtou8(buf, 0, &et_swtype))
@@ -232,7 +232,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			et_swtype &= 0x0f;
  			et_swtype <<= 4;
  			sw_type = et_swtype;
-@@ -1264,7 +1265,7 @@ static irqreturn_t bgmac_interrupt(int i
+@@ -1265,7 +1266,7 @@ static irqreturn_t bgmac_interrupt(int i
  
  	int_status &= ~(BGMAC_IS_TX0 | BGMAC_IS_RX);
  	if (int_status)
@@ -241,7 +241,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* Disable new interrupts until handling existing ones */
  	bgmac_chip_intrs_off(bgmac);
-@@ -1318,7 +1319,7 @@ static int bgmac_open(struct net_device
+@@ -1319,7 +1320,7 @@ static int bgmac_open(struct net_device
  	err = request_irq(bgmac->core->irq, bgmac_interrupt, IRQF_SHARED,
  			  KBUILD_MODNAME, net_dev);
  	if (err < 0) {
@@ -250,7 +250,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bgmac_dma_cleanup(bgmac);
  		return err;
  	}
-@@ -1599,14 +1600,14 @@ static int bgmac_fixed_phy_register(stru
+@@ -1600,14 +1601,14 @@ static int bgmac_fixed_phy_register(stru
  
  	phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, -1, NULL);
  	if (!phy_dev || IS_ERR(phy_dev)) {
@@ -267,7 +267,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return err;
  	}
  
-@@ -1646,7 +1647,7 @@ static int bgmac_mii_register(struct bgm
+@@ -1647,7 +1648,7 @@ static int bgmac_mii_register(struct bgm
  
  	err = mdiobus_register(mii_bus);
  	if (err) {
@@ -276,7 +276,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		goto err_free_irq;
  	}
  
-@@ -1658,7 +1659,7 @@ static int bgmac_mii_register(struct bgm
+@@ -1659,7 +1660,7 @@ static int bgmac_mii_register(struct bgm
  	phy_dev = phy_connect(bgmac->net_dev, bus_id, &bgmac_adjust_link,
  			      PHY_INTERFACE_MODE_MII);
  	if (IS_ERR(phy_dev)) {
@@ -285,7 +285,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		err = PTR_ERR(phy_dev);
  		goto err_unregister_bus;
  	}
-@@ -1707,7 +1708,8 @@ static int bgmac_probe(struct bcma_devic
+@@ -1708,7 +1709,8 @@ static int bgmac_probe(struct bcma_devic
  		mac = sprom->et2mac;
  		break;
  	default:
@@ -295,7 +295,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return -ENOTSUPP;
  	}
  
-@@ -1730,6 +1732,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1731,6 +1733,7 @@ static int bgmac_probe(struct bcma_devic
  	net_dev->irq = core->irq;
  	net_dev->ethtool_ops = &bgmac_ethtool_ops;
  	bgmac = netdev_priv(net_dev);
@@ -303,7 +303,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	bgmac->net_dev = net_dev;
  	bgmac->core = core;
  	bcma_set_drvdata(core, bgmac);
-@@ -1741,7 +1744,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1742,7 +1745,7 @@ static int bgmac_probe(struct bcma_devic
  	/* On BCM4706 we need common core to access PHY */
  	if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
  	    !core->bus->drv_gmac_cmn.core) {
@@ -312,7 +312,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		err = -ENODEV;
  		goto err_netdev_free;
  	}
-@@ -1760,15 +1763,15 @@ static int bgmac_probe(struct bcma_devic
+@@ -1761,15 +1764,15 @@ static int bgmac_probe(struct bcma_devic
  	}
  	bgmac->phyaddr &= BGMAC_PHY_MASK;
  	if (bgmac->phyaddr == BGMAC_PHY_MASK) {
@@ -332,7 +332,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		err = -ENOTSUPP;
  		goto err_netdev_free;
  	}
-@@ -1797,7 +1800,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1798,7 +1801,7 @@ static int bgmac_probe(struct bcma_devic
  
  	err = bgmac_dma_alloc(bgmac);
  	if (err) {
@@ -341,7 +341,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		goto err_netdev_free;
  	}
  
-@@ -1811,16 +1814,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1812,16 +1815,16 @@ static int bgmac_probe(struct bcma_devic
  	bgmac->has_robosw = !!(core->bus->sprom.boardflags_lo &
  			       BGMAC_BFL_ENETROBO);
  	if (bgmac->has_robosw)
@@ -361,7 +361,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		goto err_dma_free;
  	}
  
-@@ -1830,7 +1833,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1831,7 +1834,7 @@ static int bgmac_probe(struct bcma_devic
  
  	err = register_netdev(bgmac->net_dev);
  	if (err) {
diff --git a/target/linux/generic/patches-4.4/071-v4.8-0002-net-ethernet-bgmac-add-dma_dev-pointer.patch b/target/linux/generic/patches-4.4/071-v4.8-0002-net-ethernet-bgmac-add-dma_dev-pointer.patch
index dd5b8772e3..63036926ee 100644
--- a/target/linux/generic/patches-4.4/071-v4.8-0002-net-ethernet-bgmac-add-dma_dev-pointer.patch
+++ b/target/linux/generic/patches-4.4/071-v4.8-0002-net-ethernet-bgmac-add-dma_dev-pointer.patch
@@ -65,7 +65,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	struct bgmac_dma_desc *dma_desc = ring->cpu_base;
  	struct bgmac_slot_info *slot;
  	int i;
-@@ -573,7 +573,7 @@ static void bgmac_dma_tx_ring_free(struc
+@@ -574,7 +574,7 @@ static void bgmac_dma_tx_ring_free(struc
  static void bgmac_dma_rx_ring_free(struct bgmac *bgmac,
  				   struct bgmac_dma_ring *ring)
  {
@@ -74,7 +74,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	struct bgmac_slot_info *slot;
  	int i;
  
-@@ -594,7 +594,7 @@ static void bgmac_dma_ring_desc_free(str
+@@ -595,7 +595,7 @@ static void bgmac_dma_ring_desc_free(str
  				     struct bgmac_dma_ring *ring,
  				     int num_slots)
  {
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	int size;
  
  	if (!ring->cpu_base)
-@@ -632,7 +632,7 @@ static void bgmac_dma_free(struct bgmac
+@@ -633,7 +633,7 @@ static void bgmac_dma_free(struct bgmac
  
  static int bgmac_dma_alloc(struct bgmac *bgmac)
  {
@@ -92,7 +92,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	struct bgmac_dma_ring *ring;
  	static const u16 ring_base[] = { BGMAC_DMA_BASE0, BGMAC_DMA_BASE1,
  					 BGMAC_DMA_BASE2, BGMAC_DMA_BASE3, };
-@@ -1733,6 +1733,7 @@ static int bgmac_probe(struct bcma_devic
+@@ -1734,6 +1734,7 @@ static int bgmac_probe(struct bcma_devic
  	net_dev->ethtool_ops = &bgmac_ethtool_ops;
  	bgmac = netdev_priv(net_dev);
  	bgmac->dev = &core->dev;
diff --git a/target/linux/generic/patches-4.4/071-v4.8-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch b/target/linux/generic/patches-4.4/071-v4.8-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch
index bc7b246cc1..bf0971f208 100644
--- a/target/linux/generic/patches-4.4/071-v4.8-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch
+++ b/target/linux/generic/patches-4.4/071-v4.8-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch
@@ -317,7 +317,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +MODULE_LICENSE("GPL");
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -759,150 +759,6 @@ error:
+@@ -760,150 +760,6 @@ error:
  	return err;
  }
  
@@ -468,7 +468,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  /**************************************************
   * Chip ops
-@@ -1159,7 +1015,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -1160,7 +1016,8 @@ static void bgmac_chip_reset(struct bgma
  	else
  		bgmac_set(bgmac, BGMAC_PHY_CNTL, BGMAC_PC_MTE);
  	bgmac_miiconfig(bgmac);
@@ -478,7 +478,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	netdev_reset_queue(bgmac->net_dev);
  }
-@@ -1553,17 +1410,6 @@ static const struct ethtool_ops bgmac_et
+@@ -1554,17 +1411,6 @@ static const struct ethtool_ops bgmac_et
   * MII
   **************************************************/
  
@@ -496,7 +496,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void bgmac_adjust_link(struct net_device *net_dev)
  {
  	struct bgmac *bgmac = netdev_priv(net_dev);
-@@ -1588,7 +1434,7 @@ static void bgmac_adjust_link(struct net
+@@ -1589,7 +1435,7 @@ static void bgmac_adjust_link(struct net
  	}
  }
  
@@ -505,7 +505,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
  	struct fixed_phy_status fphy_status = {
  		.link = 1,
-@@ -1614,81 +1460,24 @@ static int bgmac_fixed_phy_register(stru
+@@ -1615,81 +1461,24 @@ static int bgmac_fixed_phy_register(stru
  	return err;
  }
  
@@ -591,7 +591,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int bgmac_probe(struct bcma_device *core)
  {
  	struct net_device *net_dev;
-@@ -1809,9 +1598,6 @@ static int bgmac_probe(struct bcma_devic
+@@ -1810,9 +1599,6 @@ static int bgmac_probe(struct bcma_devic
  	if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0)
  		bgmac->int_mask &= ~BGMAC_IS_TX_MASK;
  
@@ -601,7 +601,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	bgmac->has_robosw = !!(core->bus->sprom.boardflags_lo &
  			       BGMAC_BFL_ENETROBO);
  	if (bgmac->has_robosw)
-@@ -1822,10 +1608,25 @@ static int bgmac_probe(struct bcma_devic
+@@ -1823,10 +1609,25 @@ static int bgmac_probe(struct bcma_devic
  
  	netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
  
@@ -629,7 +629,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	net_dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
-@@ -1835,18 +1636,19 @@ static int bgmac_probe(struct bcma_devic
+@@ -1836,18 +1637,19 @@ static int bgmac_probe(struct bcma_devic
  	err = register_netdev(bgmac->net_dev);
  	if (err) {
  		dev_err(bgmac->dev, "Cannot register net device\n");
@@ -652,7 +652,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  err_netdev_free:
  	bcma_set_drvdata(core, NULL);
  	free_netdev(net_dev);
-@@ -1859,7 +1661,8 @@ static void bgmac_remove(struct bcma_dev
+@@ -1860,7 +1662,8 @@ static void bgmac_remove(struct bcma_dev
  	struct bgmac *bgmac = bcma_get_drvdata(core);
  
  	unregister_netdev(bgmac->net_dev);
diff --git a/target/linux/generic/patches-4.4/071-v4.8-0004-net-ethernet-bgmac-convert-to-feature-flags.patch b/target/linux/generic/patches-4.4/071-v4.8-0004-net-ethernet-bgmac-convert-to-feature-flags.patch
index 0f627919d0..8904e7e283 100644
--- a/target/linux/generic/patches-4.4/071-v4.8-0004-net-ethernet-bgmac-convert-to-feature-flags.patch
+++ b/target/linux/generic/patches-4.4/071-v4.8-0004-net-ethernet-bgmac-convert-to-feature-flags.patch
@@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		ctl &= ~BGMAC_DMA_RX_BL_MASK;
  		ctl |= BGMAC_DMA_RX_BL_128 << BGMAC_DMA_RX_BL_SHIFT;
  
-@@ -772,14 +772,20 @@ static void bgmac_cmdcfg_maskset(struct
+@@ -773,14 +773,20 @@ static void bgmac_cmdcfg_maskset(struct
  {
  	u32 cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);
  	u32 new_val = (cmdcfg & mask) | set;
@@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	udelay(2);
  }
  
-@@ -808,7 +814,7 @@ static void bgmac_chip_stats_update(stru
+@@ -809,7 +815,7 @@ static void bgmac_chip_stats_update(stru
  {
  	int i;
  
@@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		for (i = 0; i < BGMAC_NUM_MIB_TX_REGS; i++)
  			bgmac->mib_tx_regs[i] =
  				bgmac_read(bgmac,
-@@ -827,7 +833,7 @@ static void bgmac_clear_mib(struct bgmac
+@@ -828,7 +834,7 @@ static void bgmac_clear_mib(struct bgmac
  {
  	int i;
  
@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		return;
  
  	bgmac_set(bgmac, BGMAC_DEV_CTL, BGMAC_DC_MROR);
-@@ -870,9 +876,8 @@ static void bgmac_mac_speed(struct bgmac
+@@ -871,9 +877,8 @@ static void bgmac_mac_speed(struct bgmac
  static void bgmac_miiconfig(struct bgmac *bgmac)
  {
  	struct bcma_device *core = bgmac->core;
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bcma_awrite32(core, BCMA_IOCTL,
  			      bcma_aread32(core, BCMA_IOCTL) | 0x40 |
  			      BGMAC_BCMA_IOCTL_SW_CLKEN);
-@@ -880,6 +885,8 @@ static void bgmac_miiconfig(struct bgmac
+@@ -881,6 +886,8 @@ static void bgmac_miiconfig(struct bgmac
  		bgmac->mac_duplex = DUPLEX_FULL;
  		bgmac_mac_speed(bgmac);
  	} else {
@@ -102,7 +102,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		imode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) &
  			BGMAC_DS_MM_MASK) >> BGMAC_DS_MM_SHIFT;
  		if (imode == 0 || imode == 1) {
-@@ -894,9 +901,7 @@ static void bgmac_miiconfig(struct bgmac
+@@ -895,9 +902,7 @@ static void bgmac_miiconfig(struct bgmac
  static void bgmac_chip_reset(struct bgmac *bgmac)
  {
  	struct bcma_device *core = bgmac->core;
@@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	u32 iost;
  	int i;
  
-@@ -919,15 +924,12 @@ static void bgmac_chip_reset(struct bgma
+@@ -920,15 +925,12 @@ static void bgmac_chip_reset(struct bgma
  	}
  
  	iost = bcma_aread32(core, BCMA_IOST);
@@ -132,7 +132,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		if (iost & BGMAC_BCMA_IOST_ATTACHED) {
  			flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
  			if (!bgmac->has_robosw)
-@@ -937,7 +939,7 @@ static void bgmac_chip_reset(struct bgma
+@@ -938,7 +940,7 @@ static void bgmac_chip_reset(struct bgma
  	}
  
  	/* Request Misc PLL for corerev > 2 */
@@ -141,7 +141,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bgmac_set(bgmac, BCMA_CLKCTLST,
  			  BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
  		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
-@@ -946,9 +948,7 @@ static void bgmac_chip_reset(struct bgma
+@@ -947,9 +949,7 @@ static void bgmac_chip_reset(struct bgma
  				 1000);
  	}
  
@@ -152,7 +152,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		struct bcma_drv_cc *cc = &bgmac->core->bus->drv_cc;
  		u8 et_swtype = 0;
  		u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY |
-@@ -962,11 +962,9 @@ static void bgmac_chip_reset(struct bgma
+@@ -963,11 +963,9 @@ static void bgmac_chip_reset(struct bgma
  			et_swtype &= 0x0f;
  			et_swtype <<= 4;
  			sw_type = et_swtype;
@@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
  				  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
  		}
-@@ -986,6 +984,11 @@ static void bgmac_chip_reset(struct bgma
+@@ -987,6 +985,11 @@ static void bgmac_chip_reset(struct bgma
  	 * BGMAC_CMDCFG is read _after_ putting chip in a reset. So it has to
  	 * be keps until taking MAC out of the reset.
  	 */
@@ -178,7 +178,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	bgmac_cmdcfg_maskset(bgmac,
  			     ~(BGMAC_CMDCFG_TE |
  			       BGMAC_CMDCFG_RE |
-@@ -1003,13 +1006,13 @@ static void bgmac_chip_reset(struct bgma
+@@ -1004,13 +1007,13 @@ static void bgmac_chip_reset(struct bgma
  			     BGMAC_CMDCFG_PROM |
  			     BGMAC_CMDCFG_NLC |
  			     BGMAC_CMDCFG_CFE |
@@ -194,7 +194,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bcma_maskset32(bgmac->cmn, BCMA_GMAC_CMN_PHY_CTL, ~0,
  			       BCMA_GMAC_CMN_PC_MTE);
  	else
-@@ -1035,46 +1038,48 @@ static void bgmac_chip_intrs_off(struct
+@@ -1036,46 +1039,48 @@ static void bgmac_chip_intrs_off(struct
  /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_enable */
  static void bgmac_enable(struct bgmac *bgmac)
  {
@@ -263,7 +263,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
  		rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
  		bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) /
-@@ -1606,6 +1611,74 @@ static int bgmac_probe(struct bcma_devic
+@@ -1607,6 +1612,74 @@ static int bgmac_probe(struct bcma_devic
  	if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
  		dev_warn(bgmac->dev, "Support for ADMtek ethernet switch not implemented\n");
  
diff --git a/target/linux/generic/patches-4.4/071-v4.8-0005-net-ethernet-bgmac-Add-platform-device-support.patch b/target/linux/generic/patches-4.4/071-v4.8-0005-net-ethernet-bgmac-Add-platform-device-support.patch
index 5755184949..aabe39df43 100644
--- a/target/linux/generic/patches-4.4/071-v4.8-0005-net-ethernet-bgmac-Add-platform-device-support.patch
+++ b/target/linux/generic/patches-4.4/071-v4.8-0005-net-ethernet-bgmac-Add-platform-device-support.patch
@@ -689,7 +689,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			      ring->mmio_base + BGMAC_DMA_RX_STATUS,
  			      BGMAC_DMA_RX_STAT, BGMAC_DMA_RX_STAT_DISABLED,
  			      10000))
-@@ -643,7 +619,7 @@ static int bgmac_dma_alloc(struct bgmac
+@@ -644,7 +620,7 @@ static int bgmac_dma_alloc(struct bgmac
  	BUILD_BUG_ON(BGMAC_MAX_TX_RINGS > ARRAY_SIZE(ring_base));
  	BUILD_BUG_ON(BGMAC_MAX_RX_RINGS > ARRAY_SIZE(ring_base));
  
@@ -698,7 +698,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		dev_err(bgmac->dev, "Core does not report 64-bit DMA\n");
  		return -ENOTSUPP;
  	}
-@@ -875,12 +851,10 @@ static void bgmac_mac_speed(struct bgmac
+@@ -876,12 +852,10 @@ static void bgmac_mac_speed(struct bgmac
  
  static void bgmac_miiconfig(struct bgmac *bgmac)
  {
@@ -714,7 +714,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bgmac->mac_speed = SPEED_2500;
  		bgmac->mac_duplex = DUPLEX_FULL;
  		bgmac_mac_speed(bgmac);
-@@ -900,12 +874,11 @@ static void bgmac_miiconfig(struct bgmac
+@@ -901,12 +875,11 @@ static void bgmac_miiconfig(struct bgmac
  /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipreset */
  static void bgmac_chip_reset(struct bgmac *bgmac)
  {
@@ -728,7 +728,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		if (!bgmac->stats_grabbed) {
  			/* bgmac_chip_stats_update(bgmac); */
  			bgmac->stats_grabbed = true;
-@@ -923,7 +896,7 @@ static void bgmac_chip_reset(struct bgma
+@@ -924,7 +897,7 @@ static void bgmac_chip_reset(struct bgma
  		/* TODO: Clear software multicast filter list */
  	}
  
@@ -737,7 +737,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if (bgmac->feature_flags & BGMAC_FEAT_IOST_ATTACHED)
  		iost &= ~BGMAC_BCMA_IOST_ATTACHED;
  
-@@ -935,21 +908,20 @@ static void bgmac_chip_reset(struct bgma
+@@ -936,21 +909,20 @@ static void bgmac_chip_reset(struct bgma
  			if (!bgmac->has_robosw)
  				flags |= BGMAC_BCMA_IOCTL_SW_RESET;
  		}
@@ -761,7 +761,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		u8 et_swtype = 0;
  		u8 sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHY |
  			     BGMAC_CHIPCTL_1_IF_TYPE_MII;
-@@ -968,16 +940,15 @@ static void bgmac_chip_reset(struct bgma
+@@ -969,16 +941,15 @@ static void bgmac_chip_reset(struct bgma
  			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
  				  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
  		}
@@ -784,7 +784,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_reset
  	 * Specs don't say about using BGMAC_CMDCFG_SR, but in this routine
-@@ -1013,8 +984,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -1014,8 +985,8 @@ static void bgmac_chip_reset(struct bgma
  
  	bgmac_clear_mib(bgmac);
  	if (bgmac->feature_flags & BGMAC_FEAT_CMN_PHY_CTL)
@@ -795,7 +795,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	else
  		bgmac_set(bgmac, BGMAC_PHY_CNTL, BGMAC_PC_MTE);
  	bgmac_miiconfig(bgmac);
-@@ -1059,8 +1030,8 @@ static void bgmac_enable(struct bgmac *b
+@@ -1060,8 +1031,8 @@ static void bgmac_enable(struct bgmac *b
  	if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)
  		bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
  	if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)
@@ -806,7 +806,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	if (bgmac->feature_flags & (BGMAC_FEAT_FLW_CTRL1 |
  				    BGMAC_FEAT_FLW_CTRL2)) {
-@@ -1082,8 +1053,7 @@ static void bgmac_enable(struct bgmac *b
+@@ -1083,8 +1054,7 @@ static void bgmac_enable(struct bgmac *b
  
  		rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
  		rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
@@ -816,7 +816,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		mdp = (bp_clk * 128 / 1000) - 3;
  		rxq_ctl |= (mdp << BGMAC_RXQ_CTL_MDP_SHIFT);
  		bgmac_write(bgmac, BGMAC_RXQ_CTL, rxq_ctl);
-@@ -1178,7 +1148,7 @@ static int bgmac_open(struct net_device
+@@ -1179,7 +1149,7 @@ static int bgmac_open(struct net_device
  	/* Specs say about reclaiming rings here, but we do that in DMA init */
  	bgmac_chip_init(bgmac);
  
@@ -825,7 +825,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			  KBUILD_MODNAME, net_dev);
  	if (err < 0) {
  		dev_err(bgmac->dev, "IRQ request error: %d!\n", err);
-@@ -1204,7 +1174,7 @@ static int bgmac_stop(struct net_device
+@@ -1205,7 +1175,7 @@ static int bgmac_stop(struct net_device
  
  	napi_disable(&bgmac->napi);
  	bgmac_chip_intrs_off(bgmac);
@@ -834,7 +834,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	bgmac_chip_reset(bgmac);
  	bgmac_dma_cleanup(bgmac);
-@@ -1399,7 +1369,7 @@ static void bgmac_get_drvinfo(struct net
+@@ -1400,7 +1370,7 @@ static void bgmac_get_drvinfo(struct net
  			      struct ethtool_drvinfo *info)
  {
  	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
@@ -843,7 +843,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static const struct ethtool_ops bgmac_ethtool_ops = {
-@@ -1483,116 +1453,41 @@ static int bgmac_phy_connect(struct bgma
+@@ -1484,116 +1454,41 @@ static int bgmac_phy_connect(struct bgma
  	return 0;
  }
  
@@ -976,7 +976,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	err = bgmac_dma_alloc(bgmac);
  	if (err) {
  		dev_err(bgmac->dev, "Unable to alloc memory for DMA\n");
-@@ -1603,103 +1498,15 @@ static int bgmac_probe(struct bcma_devic
+@@ -1604,103 +1499,15 @@ static int bgmac_probe(struct bcma_devic
  	if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0)
  		bgmac->int_mask &= ~BGMAC_IS_TX_MASK;
  
@@ -1081,7 +1081,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	net_dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
-@@ -1718,56 +1525,24 @@ static int bgmac_probe(struct bcma_devic
+@@ -1719,56 +1526,24 @@ static int bgmac_probe(struct bcma_devic
  
  err_phy_disconnect:
  	phy_disconnect(net_dev->phydev);
diff --git a/target/linux/generic/patches-4.4/071-v4.9-0001-net-bgmac-support-Ethernet-core-on-BCM53573-SoCs.patch b/target/linux/generic/patches-4.4/071-v4.9-0001-net-bgmac-support-Ethernet-core-on-BCM53573-SoCs.patch
index 82d3fe4d6d..b1e4a7ce94 100644
--- a/target/linux/generic/patches-4.4/071-v4.9-0001-net-bgmac-support-Ethernet-core-on-BCM53573-SoCs.patch
+++ b/target/linux/generic/patches-4.4/071-v4.9-0001-net-bgmac-support-Ethernet-core-on-BCM53573-SoCs.patch
@@ -75,7 +75,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		bgmac->feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -943,6 +943,27 @@ static void bgmac_chip_reset(struct bgma
+@@ -944,6 +944,27 @@ static void bgmac_chip_reset(struct bgma
  		bgmac_cco_ctl_maskset(bgmac, 1, ~(BGMAC_CHIPCTL_1_IF_TYPE_MASK |
  						  BGMAC_CHIPCTL_1_SW_TYPE_MASK),
  				      sw_type);
@@ -103,7 +103,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	if (iost & BGMAC_BCMA_IOST_ATTACHED && !bgmac->has_robosw)
-@@ -1486,6 +1507,10 @@ int bgmac_enet_probe(struct bgmac *info)
+@@ -1487,6 +1508,10 @@ int bgmac_enet_probe(struct bgmac *info)
  	 */
  	bgmac_clk_enable(bgmac, 0);
  
diff --git a/target/linux/generic/patches-4.4/071-v4.9-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch b/target/linux/generic/patches-4.4/071-v4.9-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch
index 272ec5c3f3..b0092f48ff 100644
--- a/target/linux/generic/patches-4.4/071-v4.9-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch
+++ b/target/linux/generic/patches-4.4/071-v4.9-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -935,7 +935,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -936,7 +936,8 @@ static void bgmac_chip_reset(struct bgma
  			et_swtype <<= 4;
  			sw_type = et_swtype;
  		} else if (bgmac->feature_flags & BGMAC_FEAT_SW_TYPE_EPHYRMII) {
diff --git a/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch b/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch
index 830d8ccde4..2fcee207c0 100644
--- a/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch
+++ b/target/linux/generic/patches-4.4/071-v4.9-0003-net-bgmac-Fix-errant-feature-flag-check.patch
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1049,7 +1049,7 @@ static void bgmac_enable(struct bgmac *b
+@@ -1050,7 +1050,7 @@ static void bgmac_enable(struct bgmac *b
  
  	mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
  		BGMAC_DS_MM_SHIFT;
diff --git a/target/linux/generic/patches-4.4/071-v4.9-0004-net-bgmac-fix-spelling-mistake-connecton-connection.patch b/target/linux/generic/patches-4.4/071-v4.9-0004-net-bgmac-fix-spelling-mistake-connecton-connection.patch
index 5721abcf95..ccd1e9782b 100644
--- a/target/linux/generic/patches-4.4/071-v4.9-0004-net-bgmac-fix-spelling-mistake-connecton-connection.patch
+++ b/target/linux/generic/patches-4.4/071-v4.9-0004-net-bgmac-fix-spelling-mistake-connecton-connection.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1468,7 +1468,7 @@ static int bgmac_phy_connect(struct bgma
+@@ -1469,7 +1469,7 @@ static int bgmac_phy_connect(struct bgma
  	phy_dev = phy_connect(bgmac->net_dev, bus_id, &bgmac_adjust_link,
  			      PHY_INTERFACE_MODE_MII);
  	if (IS_ERR(phy_dev)) {
diff --git a/target/linux/generic/patches-4.4/071-v4.9-0005-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch b/target/linux/generic/patches-4.4/071-v4.9-0005-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch
index e9bf06c870..aec57a956e 100644
--- a/target/linux/generic/patches-4.4/071-v4.9-0005-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch
+++ b/target/linux/generic/patches-4.4/071-v4.9-0005-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch
@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1049,9 +1049,9 @@ static void bgmac_enable(struct bgmac *b
+@@ -1050,9 +1050,9 @@ static void bgmac_enable(struct bgmac *b
  
  	mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
  		BGMAC_DS_MM_SHIFT;
diff --git a/target/linux/generic/patches-4.4/073-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch b/target/linux/generic/patches-4.4/073-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch
index 544a074a78..956f8adfbb 100644
--- a/target/linux/generic/patches-4.4/073-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch
+++ b/target/linux/generic/patches-4.4/073-v4.10-0001-net-bgmac-allocate-struct-bgmac-just-once-don-t-copy.patch
@@ -68,7 +68,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1475,22 +1475,32 @@ static int bgmac_phy_connect(struct bgma
+@@ -1476,22 +1476,32 @@ static int bgmac_phy_connect(struct bgma
  	return 0;
  }
  
@@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	net_dev->irq = bgmac->irq;
  	SET_NETDEV_DEV(net_dev, bgmac->dev);
  
-@@ -1517,7 +1527,7 @@ int bgmac_enet_probe(struct bgmac *info)
+@@ -1518,7 +1528,7 @@ int bgmac_enet_probe(struct bgmac *info)
  	err = bgmac_dma_alloc(bgmac);
  	if (err) {
  		dev_err(bgmac->dev, "Unable to alloc memory for DMA\n");
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	}
  
  	bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK;
-@@ -1553,8 +1563,7 @@ err_phy_disconnect:
+@@ -1554,8 +1564,7 @@ err_phy_disconnect:
  	phy_disconnect(net_dev->phydev);
  err_dma_free:
  	bgmac_dma_free(bgmac);
diff --git a/target/linux/generic/patches-4.4/083-0001-clk-Add-devm_-clk_hw_-register-unregister-APIs.patch b/target/linux/generic/patches-4.4/083-0001-clk-Add-devm_-clk_hw_-register-unregister-APIs.patch
index 0408353138..b0cb2099b2 100644
--- a/target/linux/generic/patches-4.4/083-0001-clk-Add-devm_-clk_hw_-register-unregister-APIs.patch
+++ b/target/linux/generic/patches-4.4/083-0001-clk-Add-devm_-clk_hw_-register-unregister-APIs.patch
@@ -36,7 +36,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
    dmam_alloc_coherent()
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -2595,6 +2595,22 @@ fail_out:
+@@ -2598,6 +2598,22 @@ fail_out:
  }
  EXPORT_SYMBOL_GPL(clk_register);
  
@@ -59,7 +59,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  /* Free memory allocated for a clock. */
  static void __clk_release(struct kref *ref)
  {
-@@ -2696,11 +2712,26 @@ void clk_unregister(struct clk *clk)
+@@ -2699,11 +2715,26 @@ void clk_unregister(struct clk *clk)
  }
  EXPORT_SYMBOL_GPL(clk_unregister);
  
@@ -86,7 +86,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  /**
   * devm_clk_register - resource managed clk_register()
   * @dev: device that is registering this clock
-@@ -2731,6 +2762,36 @@ struct clk *devm_clk_register(struct dev
+@@ -2734,6 +2765,36 @@ struct clk *devm_clk_register(struct dev
  }
  EXPORT_SYMBOL_GPL(devm_clk_register);
  
@@ -123,7 +123,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  static int devm_clk_match(struct device *dev, void *res, void *data)
  {
  	struct clk *c = res;
-@@ -2739,6 +2800,15 @@ static int devm_clk_match(struct device
+@@ -2742,6 +2803,15 @@ static int devm_clk_match(struct device
  	return c == data;
  }
  
@@ -139,7 +139,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  /**
   * devm_clk_unregister - resource managed clk_unregister()
   * @clk: clock to unregister
-@@ -2753,6 +2823,22 @@ void devm_clk_unregister(struct device *
+@@ -2756,6 +2826,22 @@ void devm_clk_unregister(struct device *
  }
  EXPORT_SYMBOL_GPL(devm_clk_unregister);
  
diff --git a/target/linux/generic/patches-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch b/target/linux/generic/patches-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch
index 0bcb5bb805..983cf14aec 100644
--- a/target/linux/generic/patches-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch
+++ b/target/linux/generic/patches-4.4/083-0002-clk-Add-clk_hw-OF-clk-providers.patch
@@ -30,7 +30,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
 
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -3001,6 +3001,7 @@ struct of_clk_provider {
+@@ -3004,6 +3004,7 @@ struct of_clk_provider {
  
  	struct device_node *node;
  	struct clk *(*get)(struct of_phandle_args *clkspec, void *data);
@@ -38,7 +38,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  	void *data;
  };
  
-@@ -3017,6 +3018,12 @@ struct clk *of_clk_src_simple_get(struct
+@@ -3020,6 +3021,12 @@ struct clk *of_clk_src_simple_get(struct
  }
  EXPORT_SYMBOL_GPL(of_clk_src_simple_get);
  
@@ -51,7 +51,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  struct clk *of_clk_src_onecell_get(struct of_phandle_args *clkspec, void *data)
  {
  	struct clk_onecell_data *clk_data = data;
-@@ -3031,6 +3038,21 @@ struct clk *of_clk_src_onecell_get(struc
+@@ -3034,6 +3041,21 @@ struct clk *of_clk_src_onecell_get(struc
  }
  EXPORT_SYMBOL_GPL(of_clk_src_onecell_get);
  
@@ -73,7 +73,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  /**
   * of_clk_add_provider() - Register a clock provider for a node
   * @np: Device node pointer associated with clock provider
-@@ -3067,6 +3089,41 @@ int of_clk_add_provider(struct device_no
+@@ -3070,6 +3092,41 @@ int of_clk_add_provider(struct device_no
  EXPORT_SYMBOL_GPL(of_clk_add_provider);
  
  /**
@@ -115,7 +115,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
   * of_clk_del_provider() - Remove a previously registered clock provider
   * @np: Device node pointer associated with clock provider
   */
-@@ -3087,11 +3144,32 @@ void of_clk_del_provider(struct device_n
+@@ -3090,11 +3147,32 @@ void of_clk_del_provider(struct device_n
  }
  EXPORT_SYMBOL_GPL(of_clk_del_provider);
  
@@ -148,7 +148,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  
  	if (!clkspec)
  		return ERR_PTR(-EINVAL);
-@@ -3100,10 +3178,9 @@ struct clk *__of_clk_get_from_provider(s
+@@ -3103,10 +3181,9 @@ struct clk *__of_clk_get_from_provider(s
  	mutex_lock(&of_clk_mutex);
  	list_for_each_entry(provider, &of_clk_providers, link) {
  		if (provider->node == clkspec->np)
diff --git a/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch b/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
index 3dad08008b..5940ac4994 100644
--- a/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
+++ b/target/linux/generic/patches-4.4/099-0007-qmi_wwan-add-support-for-Quectel-EC21-and-EC25.patch
@@ -82,8 +82,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  /* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */
  #define QMI_GOBI1K_DEVICE(vend, prod) \
  	QMI_FIXED_INTF(vend, prod, 3)
-@@ -909,6 +933,8 @@ static const struct usb_device_id produc
- 	{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},	/* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
+@@ -914,6 +938,8 @@ static const struct usb_device_id produc
+ 	{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)},	/* HP lt4120 Snapdragon X5 LTE */
  	{QMI_FIXED_INTF(0x22de, 0x9061, 3)},	/* WeTelecom WPD-600N */
  	{QMI_FIXED_INTF(0x1e0e, 0x9001, 5)},	/* SIMCom 7230E */
 +	{QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)},	/* Quectel EC25, EC20 R2.0  Mini PCIe */
diff --git a/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index b7ff845343..3b640c7073 100644
--- a/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	.get_acl =	jffs2_get_acl,
  	.set_acl =	jffs2_set_acl,
  	.setattr =	jffs2_setattr,
-@@ -754,8 +754,27 @@ static int jffs2_mknod (struct inode *di
+@@ -750,8 +750,27 @@ static int jffs2_mknod (struct inode *di
  	return ret;
  }
  
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  {
  	int ret;
  	struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
-@@ -763,6 +782,9 @@ static int jffs2_rename (struct inode *o
+@@ -759,6 +778,9 @@ static int jffs2_rename (struct inode *o
  	uint8_t type;
  	uint32_t now;
  
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	/* The VFS will check for us and prevent trying to rename a
  	 * file over a directory and vice versa, but if it's a directory,
  	 * the VFS can't check whether the victim is empty. The filesystem
-@@ -826,9 +848,14 @@ static int jffs2_rename (struct inode *o
+@@ -822,9 +844,14 @@ static int jffs2_rename (struct inode *o
  	if (d_is_dir(old_dentry) && !victim_f)
  		inc_nlink(new_dir_i);
  
diff --git a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
index 37eb073df9..ac231272e2 100644
--- a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
@@ -7,7 +7,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/fs/jffs2/dir.c
 +++ b/fs/jffs2/dir.c
-@@ -779,18 +779,31 @@ static int jffs2_rename (struct inode *o
+@@ -775,18 +775,31 @@ static int jffs2_rename (struct inode *o
  	int ret;
  	struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
  	struct jffs2_inode_info *victim_f = NULL;
@@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
  		if (d_is_dir(new_dentry)) {
  			struct jffs2_full_dirent *fd;
-@@ -825,7 +838,7 @@ static int jffs2_rename (struct inode *o
+@@ -821,7 +834,7 @@ static int jffs2_rename (struct inode *o
  	if (ret)
  		return ret;
  
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		/* There was a victim. Kill it off nicely */
  		if (d_is_dir(new_dentry))
  			clear_nlink(d_inode(new_dentry));
-@@ -845,12 +858,18 @@ static int jffs2_rename (struct inode *o
+@@ -841,12 +854,18 @@ static int jffs2_rename (struct inode *o
  
  	/* If it was a directory we moved, and there was no victim,
  	   increase i_nlink on its new parent */
@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	else
  		/* Unlink the original */
  		ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-@@ -882,7 +901,7 @@ static int jffs2_rename (struct inode *o
+@@ -878,7 +897,7 @@ static int jffs2_rename (struct inode *o
  		return ret;
  	}
  
diff --git a/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch b/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
index 9065369040..4edc16eb7f 100644
--- a/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
+++ b/target/linux/generic/patches-4.4/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
@@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  /*
   *	IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
-@@ -135,11 +136,13 @@
+@@ -136,11 +137,13 @@
   *	This is an Ethernet frame header.
   */
  
diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
index f3fe51fc8e..dcd9928e7a 100644
--- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	if (!net_eq(dev_net(dev), sock_net(sk)))
  		goto drop;
  
-@@ -3135,6 +3137,7 @@ static int packet_create(struct net *net
+@@ -3137,6 +3139,7 @@ static int packet_create(struct net *net
  	mutex_init(&po->pg_vec_lock);
  	po->rollover = NULL;
  	po->prot_hook.func = packet_rcv;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  	if (sock->type == SOCK_PACKET)
  		po->prot_hook.func = packet_rcv_spkt;
-@@ -3793,6 +3796,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3795,6 +3798,16 @@ packet_setsockopt(struct socket *sock, i
  		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
  		return 0;
  	}
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	default:
  		return -ENOPROTOOPT;
  	}
-@@ -3845,6 +3858,13 @@ static int packet_getsockopt(struct sock
+@@ -3847,6 +3860,13 @@ static int packet_getsockopt(struct sock
  	case PACKET_VNET_HDR:
  		val = po->has_vnet_hdr;
  		break;
diff --git a/target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
index b3cb087235..df11a7e7f7 100644
--- a/target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <linux/bcm47xx_nvram.h>
  #include "bgmac.h"
  
-@@ -1403,6 +1404,17 @@ static const struct ethtool_ops bgmac_et
+@@ -1404,6 +1405,17 @@ static const struct ethtool_ops bgmac_et
  	.get_drvinfo		= bgmac_get_drvinfo,
  };
  
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /**************************************************
   * MII
   **************************************************/
-@@ -1549,6 +1561,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
+@@ -1550,6 +1562,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
  	net_dev->hw_features = net_dev->features;
  	net_dev->vlan_features = net_dev->features;
  
@@ -45,7 +45,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  	err = register_netdev(bgmac->net_dev);
  	if (err) {
  		dev_err(bgmac->dev, "Cannot register net device\n");
-@@ -1571,6 +1591,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
+@@ -1572,6 +1592,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
  
  void bgmac_enet_remove(struct bgmac *bgmac)
  {
diff --git a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
index fd804cae9a..ddac711bbd 100644
--- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  /**
   *	ata_build_rw_tf - Build ATA taskfile for given read/write request
   *	@tf: Target ATA taskfile
-@@ -4805,6 +4818,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4811,6 +4824,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
  		if (tag < 0)
  			return NULL;
  	}
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  	qc = __ata_qc_from_tag(ap, tag);
  	qc->tag = tag;
-@@ -5701,6 +5717,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5707,6 +5723,9 @@ struct ata_port *ata_port_alloc(struct a
  	ap->stats.unhandled_irq = 1;
  	ap->stats.idle_irq = 1;
  #endif
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  	ata_sff_port_init(ap);
  
  	return ap;
-@@ -5722,6 +5741,12 @@ static void ata_host_release(struct devi
+@@ -5728,6 +5747,12 @@ static void ata_host_release(struct devi
  
  		kfree(ap->pmp_link);
  		kfree(ap->slave_link);
@@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  		kfree(ap);
  		host->ports[i] = NULL;
  	}
-@@ -6168,7 +6193,23 @@ int ata_host_register(struct ata_host *h
+@@ -6174,7 +6199,23 @@ int ata_host_register(struct ata_host *h
  		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
  		host->ports[i]->local_port_no = i + 1;
  	}
diff --git a/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch b/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch
index 4733d1b79c..b304e141b9 100644
--- a/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch
+++ b/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch
@@ -30,7 +30,7 @@
  static void __sk_free(struct sock *sk)
  {
 +#ifdef CONFIG_SOCK_DIAG
- 	if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt))
+ 	if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk)))
  		sock_diag_broadcast_destroy(sk);
  	else
 +#endif