diff options
| author | John Crispin <john@openwrt.org> | 2015-02-12 09:17:04 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-02-12 09:17:04 +0000 |
| commit | 1eb616764e5bb799b5a62fd717cf8cd0c07281f9 (patch) | |
| tree | dc6e48dd409ee0cd69f692097f04db156b183885 /target/linux | |
| parent | c5b7e1aaf4692c3abff6df1c5b86bbfdcf367eb3 (diff) | |
| download | upstream-1eb616764e5bb799b5a62fd717cf8cd0c07281f9.tar.gz upstream-1eb616764e5bb799b5a62fd717cf8cd0c07281f9.tar.bz2 upstream-1eb616764e5bb799b5a62fd717cf8cd0c07281f9.zip | |
lantiq: fix mac addr assignment inside lantiq_etop
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 44420
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index d7e1c0bc86..3854d3a6bd 100644 --- a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -30,7 +30,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +#endif /* _PCI_ATH_FIXUP */ --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -@@ -90,5 +90,8 @@ int xrx200_gphy_boot(struct device *dev, +@@ -90,5 +90,8 @@ extern void ltq_pmu_enable(unsigned int module); extern void ltq_pmu_disable(unsigned int module); @@ -41,7 +41,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #endif /* _LTQ_XWAY_H__ */ --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -2,4 +2,7 @@ obj-y := prom.o sysctrl.o clk.o reset.o +@@ -2,4 +2,7 @@ obj-y += vmmc.o tffs.o @@ -590,7 +590,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +device_initcall(of_ralink_eeprom_init); --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c -@@ -161,7 +161,7 @@ struct ltq_etop_priv { +@@ -161,7 +161,7 @@ int tx_irq; int rx_irq; @@ -599,15 +599,15 @@ Signed-off-by: John Crispin <blogic@openwrt.org> int mii_mode; spinlock_t lock; -@@ -840,7 +840,11 @@ ltq_etop_init(struct net_device *dev) +@@ -840,7 +840,11 @@ if (err) goto err_hw; - memcpy(&mac, &priv->pldata->mac, sizeof(struct sockaddr)); + if (priv->mac) -+ memcpy(&mac, priv->mac, sizeof(struct sockaddr)); ++ memcpy(&mac.sa_data, priv->mac, ETH_ALEN); + else -+ memcpy(&mac, ltq_get_eth_mac(), sizeof(struct sockaddr)); ++ memcpy(&mac.sa_data, ltq_get_eth_mac(), ETH_ALEN); + if (!is_valid_ether_addr(mac.sa_data)) { pr_warn("etop: invalid MAC, using random\n"); |