diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2016-08-22 09:47:34 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2016-08-22 10:01:04 +0200 |
| commit | 4eb376586c5785025af07d439f58cb31337bb6b6 (patch) | |
| tree | b75d926fc599ed991b1fae213e6746dd4f5f36e7 /target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch | |
| parent | c6164d961037ceb722b03ccfe1725be6b9a6d533 (diff) | |
| download | upstream-4eb376586c5785025af07d439f58cb31337bb6b6.tar.gz upstream-4eb376586c5785025af07d439f58cb31337bb6b6.tar.bz2 upstream-4eb376586c5785025af07d439f58cb31337bb6b6.zip | |
kernel: bgmac: use upstream accepted patches
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 | 6 |
1 files changed, 3 insertions, 3 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 e5c0a6301f..49c0dcac3d 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> #include "bgmac.h" -@@ -1399,6 +1400,17 @@ static const struct ethtool_ops bgmac_et +@@ -1400,6 +1401,17 @@ static const struct ethtool_ops bgmac_et .get_drvinfo = bgmac_get_drvinfo, }; @@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * MII **************************************************/ -@@ -1535,6 +1547,14 @@ int bgmac_enet_probe(struct bgmac *info) +@@ -1536,6 +1548,14 @@ int bgmac_enet_probe(struct bgmac *info) 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) { dev_err(bgmac->dev, "Cannot register net device\n"); -@@ -1558,6 +1578,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe); +@@ -1559,6 +1579,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe); void bgmac_enet_remove(struct bgmac *bgmac) { |