aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-09-16 16:41:48 -0700
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-18 02:08:18 +0300
commitbb83c9dcca9d7080a704e8a04a58ef37e11681fd (patch)
tree0b6f2bace2bed4b442c6b16fc206458715288257 /target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch
parent2375e279a7cb462d62fd6028cb3fbd56217222de (diff)
downloadupstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.gz
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.bz2
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.zip
kernel: update to 3.18.71
Delete a bunch of fixes that are already included. Refresh patches. Compile-tested on malta/mipsel Runtime-tested on malta/mipsel Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch
index 52fc252447..a93877b69e 100644
--- a/target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/pending-3.18/773-bgmac-add-srab-switch.patch
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1666,6 +1678,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1671,6 +1683,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");
-@@ -1692,6 +1714,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1697,6 +1719,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);