summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-06-20 22:38:01 +0200
committerRafał Miłecki <zajec5@gmail.com>2016-06-20 23:07:31 +0200
commit65a22d84ad1a921751ac9e5a1a5b52dad6967e16 (patch)
treead4c581f2eefb65070f89320346289f16a169cd7 /target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
parent4bd0edba1ea545954901d4f9e01db60a7d97a7bb (diff)
downloadmaster-31e0f0ae-65a22d84ad1a921751ac9e5a1a5b52dad6967e16.tar.gz
master-31e0f0ae-65a22d84ad1a921751ac9e5a1a5b52dad6967e16.tar.bz2
master-31e0f0ae-65a22d84ad1a921751ac9e5a1a5b52dad6967e16.zip
kernel: backport bgmac changes from net-next
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch')
-rw-r--r--target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch b/target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
index 88db7b2fff..514fe26f1b 100644
--- a/target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
+++ b/target/linux/generic/patches-4.4/071-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
case BCMA_CHIP_ID_BCM53018:
return true;
default:
-@@ -1047,8 +1048,9 @@ static void bgmac_chip_reset(struct bgma
+@@ -1052,8 +1053,9 @@ static void bgmac_chip_reset(struct bgma
(ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
iost &= ~BGMAC_BCMA_IOST_ATTACHED;