Make it consistent with the net_device struct and the xrx200 driver

Signed-off-by: Martin Blumenstingl <[email protected]>
---
 .../lantiq/patches-3.18/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-3.18/0028-NET-lantiq-various-etop-fixes.patch 
b/target/linux/lantiq/patches-3.18/0028-NET-lantiq-various-etop-fixes.patch
index 187e301..6a752f9 100644
--- a/target/linux/lantiq/patches-3.18/0028-NET-lantiq-various-etop-fixes.patch
+++ b/target/linux/lantiq/patches-3.18/0028-NET-lantiq-various-etop-fixes.patch
@@ -170,7 +170,7 @@ Signed-off-by: John Crispin <[email protected]>
 +      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-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 04c2071..094d16c 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
@@ -590,15 +590,6 @@ Signed-off-by: John Crispin <[email protected]>
 +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.4.4
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to