diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 21:05:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 21:05:19 +0000 |
| commit | 93a2b8a6c47741ae1fc369d0245340c42f809418 (patch) | |
| tree | 8575eb03723cd9797a505713cebcdeac2bf2d1d3 /target/linux/mpc85xx/patches-3.18/101-net-gianfar-use-mtd-mac-address.patch | |
| parent | 495935a3b81ac88bc524adabfe4e28155e0f5dac (diff) | |
| download | upstream-93a2b8a6c47741ae1fc369d0245340c42f809418.tar.gz upstream-93a2b8a6c47741ae1fc369d0245340c42f809418.tar.bz2 upstream-93a2b8a6c47741ae1fc369d0245340c42f809418.zip | |
mpc85xx: update to linux 4.4, remove unnecessary patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48297
Diffstat (limited to 'target/linux/mpc85xx/patches-3.18/101-net-gianfar-use-mtd-mac-address.patch')
| -rw-r--r-- | target/linux/mpc85xx/patches-3.18/101-net-gianfar-use-mtd-mac-address.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/target/linux/mpc85xx/patches-3.18/101-net-gianfar-use-mtd-mac-address.patch b/target/linux/mpc85xx/patches-3.18/101-net-gianfar-use-mtd-mac-address.patch deleted file mode 100644 index 1b7abc8780..0000000000 --- a/target/linux/mpc85xx/patches-3.18/101-net-gianfar-use-mtd-mac-address.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/drivers/net/ethernet/freescale/gianfar.c -+++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -858,10 +858,13 @@ static int gfar_of_init(struct platform_ - if (stash_len || stash_idx) - priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING; - -- mac_addr = of_get_mac_address(np); -+ err = of_get_mac_address_mtd(np, dev->dev_addr); -+ if (err) { -+ mac_addr = of_get_mac_address(np); - -- if (mac_addr) -- memcpy(dev->dev_addr, mac_addr, ETH_ALEN); -+ if (mac_addr) -+ memcpy(dev->dev_addr, mac_addr, ETH_ALEN); -+ } - - if (model && !strcasecmp(model, "TSEC")) - priv->device_flags |= FSL_GIANFAR_DEV_HAS_GIGABIT | |