diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-05-03 18:04:46 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-05-03 18:04:46 +0000 |
| commit | aea93173d1d492b6c9508336ec965aecb09b69e1 (patch) | |
| tree | 4f1770f000b551a5e77e75ae2e8d25a43e987ff6 /target/linux | |
| parent | 2659762e62a5b7328497e56ca723b7d69cbb3461 (diff) | |
| download | upstream-aea93173d1d492b6c9508336ec965aecb09b69e1.tar.gz upstream-aea93173d1d492b6c9508336ec965aecb09b69e1.tar.bz2 upstream-aea93173d1d492b6c9508336ec965aecb09b69e1.zip | |
generic/4.0: update to 4.0.1
Also refresh one patch.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 45601
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch index 0a8b451247..b883d73af3 100644 --- a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch @@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <bcm47xx_nvram.h> static const struct bcma_device_id bgmac_bcma_tbl[] = { -@@ -1432,6 +1433,17 @@ static void bgmac_mii_unregister(struct +@@ -1538,6 +1539,17 @@ static void bgmac_mii_unregister(struct mdiobus_free(mii_bus); } @@ -30,9 +30,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * BCMA bus ops **************************************************/ -@@ -1551,6 +1563,16 @@ static int bgmac_probe(struct bcma_devic - goto err_dma_free; - } +@@ -1664,6 +1676,16 @@ static int bgmac_probe(struct bcma_devic + net_dev->hw_features = net_dev->features; + net_dev->vlan_features = net_dev->features; + if ((ci->id == BCMA_CHIP_ID_BCM4707 || + ci->id == BCMA_CHIP_ID_BCM53018) && @@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> err = register_netdev(bgmac->net_dev); if (err) { bgmac_err(bgmac, "Cannot register net device\n"); -@@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1690,6 +1712,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); @@ -60,7 +60,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> netif_napi_del(&bgmac->napi); --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -457,6 +457,9 @@ struct bgmac { +@@ -462,6 +462,9 @@ struct bgmac { bool has_robosw; bool loopback; |