From 102cb4742c14f78bf86b7d77c568c205f0d99d85 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 21 Nov 2016 18:18:47 +0000 Subject: kernel: bump to 4.4.35 Refresh patches on all 4.4 supported platforms. 077-0005-bgmac-stop-clearing-DMA-receive-control-register-rig.patch removed as now upstream. Compile & run tested: ar71xx - Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant --- ...ernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/generic/patches-4.4/075-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch') diff --git a/target/linux/generic/patches-4.4/075-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch b/target/linux/generic/patches-4.4/075-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch index f698a6fca0..bc7b246cc1 100644 --- a/target/linux/generic/patches-4.4/075-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch +++ b/target/linux/generic/patches-4.4/075-0003-net-ethernet-bgmac-move-BCMA-MDIO-Phy-code-into-a-se.patch @@ -317,7 +317,7 @@ Signed-off-by: David S. Miller +MODULE_LICENSE("GPL"); --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -756,150 +756,6 @@ error: +@@ -759,150 +759,6 @@ error: return err; } @@ -468,7 +468,7 @@ Signed-off-by: David S. Miller /************************************************** * Chip ops -@@ -1156,7 +1012,8 @@ static void bgmac_chip_reset(struct bgma +@@ -1159,7 +1015,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 netdev_reset_queue(bgmac->net_dev); } -@@ -1550,17 +1407,6 @@ static const struct ethtool_ops bgmac_et +@@ -1553,17 +1410,6 @@ static const struct ethtool_ops bgmac_et * MII **************************************************/ @@ -496,7 +496,7 @@ Signed-off-by: David S. Miller static void bgmac_adjust_link(struct net_device *net_dev) { struct bgmac *bgmac = netdev_priv(net_dev); -@@ -1585,7 +1431,7 @@ static void bgmac_adjust_link(struct net +@@ -1588,7 +1434,7 @@ static void bgmac_adjust_link(struct net } } @@ -505,7 +505,7 @@ Signed-off-by: David S. Miller { struct fixed_phy_status fphy_status = { .link = 1, -@@ -1611,81 +1457,24 @@ static int bgmac_fixed_phy_register(stru +@@ -1614,81 +1460,24 @@ static int bgmac_fixed_phy_register(stru return err; } @@ -591,7 +591,7 @@ Signed-off-by: David S. Miller static int bgmac_probe(struct bcma_device *core) { struct net_device *net_dev; -@@ -1806,9 +1595,6 @@ static int bgmac_probe(struct bcma_devic +@@ -1809,9 +1598,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 bgmac->has_robosw = !!(core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETROBO); if (bgmac->has_robosw) -@@ -1819,10 +1605,25 @@ static int bgmac_probe(struct bcma_devic +@@ -1822,10 +1608,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 } net_dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; -@@ -1832,18 +1633,19 @@ static int bgmac_probe(struct bcma_devic +@@ -1835,18 +1636,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 err_netdev_free: bcma_set_drvdata(core, NULL); free_netdev(net_dev); -@@ -1856,7 +1658,8 @@ static void bgmac_remove(struct bcma_dev +@@ -1859,7 +1661,8 @@ static void bgmac_remove(struct bcma_dev struct bgmac *bgmac = bcma_get_drvdata(core); unregister_netdev(bgmac->net_dev); -- cgit v1.2.3