diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2016-08-16 17:40:32 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2016-08-16 22:42:00 +0200 |
| commit | 13e20e6956320bd642314a4e364d5eea584a5849 (patch) | |
| tree | ebca08563633bc3764cb3fa8f7c24d18a4785853 /target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch | |
| parent | 99a188828713d6ff9c541590b08d4e63ef52f6d7 (diff) | |
| download | upstream-13e20e6956320bd642314a4e364d5eea584a5849.tar.gz upstream-13e20e6956320bd642314a4e364d5eea584a5849.tar.bz2 upstream-13e20e6956320bd642314a4e364d5eea584a5849.zip | |
kernel: update bgmac by adding Florian's upstream changes
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 4348574cbb..14986b571a 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> static const struct bcma_device_id bgmac_bcma_tbl[] = { -@@ -1683,6 +1684,17 @@ static void bgmac_mii_unregister(struct +@@ -1680,6 +1681,17 @@ static void bgmac_mii_unregister(struct mdiobus_free(mii_bus); } @@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * BCMA bus ops **************************************************/ -@@ -1828,6 +1840,14 @@ static int bgmac_probe(struct bcma_devic +@@ -1825,6 +1837,14 @@ static int bgmac_probe(struct bcma_devic 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) { bgmac_err(bgmac, "Cannot register net device\n"); -@@ -1854,6 +1874,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1851,6 +1871,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); @@ -58,7 +58,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 -@@ -463,6 +463,9 @@ struct bgmac { +@@ -462,6 +462,9 @@ struct bgmac { bool has_robosw; bool loopback; |