[OpenWrt-Devel] [PATCH] lantiq: Change the data-type of mac address in ETOP driver

[Martin Blumenstingl]

This adds the changes from r46219 to the linux 4.1 patches as well.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
---
It seems that I forgot to include these in the original patchset which
added the 4.1 patches for the lantiq target.
Thanks to Mathias Kresin for finding this.

 .../lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch  | 2 +-
 .../0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch     | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch
index e0421e9..3301264 100644
--- a/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch
+++ b/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch
@@ -170,7 +170,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	int tx_irq;
 +	int rx_irq;
 +
-+	const void *mac;
++	unsigned char mac[6];
 +	int mii_mode;
  
  	spinlock_t lock;
diff --git a/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index 72ae1c9..ec769ccf 100644
--- a/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -590,15 +590,6 @@ Signed-off-by: John Crispin <blogic at 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 {
- 	int tx_irq;
- 	int rx_irq;
- 
--	const void *mac;
-+	void *mac;
- 	int mii_mode;
- 
- 	spinlock_t lock;
 @@ -840,7 +840,11 @@ ltq_etop_init(struct net_device *dev)
  	if (err)
  		goto err_hw;
-- 
2.6.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel