aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-05-08 21:09:18 +0000
committerLuka Perkov <luka@openwrt.org>2016-06-19 19:56:13 +0200
commitcd903cf340a0e080586d50adde61f82eadc907d3 (patch)
tree140d2458b3005e1b70de03e64c2923488e2d4553 /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch
parentfb582172ad8291c7cd4d015f1606b1f31fd4485a (diff)
downloadupstream-cd903cf340a0e080586d50adde61f82eadc907d3.tar.gz
upstream-cd903cf340a0e080586d50adde61f82eadc907d3.tar.bz2
upstream-cd903cf340a0e080586d50adde61f82eadc907d3.zip
kernel: use backported versions of bgmac patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49298 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch4
1 files changed, 2 insertions, 2 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 559731300b..9f39c8000e 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
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1668,6 +1680,14 @@ static int bgmac_probe(struct bcma_devic
+@@ -1688,6 +1700,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");
-@@ -1694,6 +1714,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1714,6 +1734,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);