aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-14 12:17:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-14 12:17:20 +0000
commit5c9c6706165d3ce7276eed2c557089aa690c6529 (patch)
treea2dd8347d61e31d94dd0bd801720d6001983b43d /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
parentcd4fd05648194a252a560876742acab461f4ec8e (diff)
downloadupstream-5c9c6706165d3ce7276eed2c557089aa690c6529.tar.gz
upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.tar.bz2
upstream-5c9c6706165d3ce7276eed2c557089aa690c6529.zip
kernel: update bgmac patches to the latest version submitted
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45431
Diffstat (limited to 'target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
index d6f1f3301c..3b2751f529 100644
--- a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.18/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[] = {
-@@ -1520,6 +1521,17 @@ static void bgmac_mii_unregister(struct
+@@ -1538,6 +1539,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
**************************************************/
-@@ -1646,6 +1658,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -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;
@@ -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");
-@@ -1672,6 +1694,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);