lantiq: Change the data-type of mac address in ETOP driver

Make it consistent with the net_device struct and the xrx200 driver

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
SVN-Revision: 46219

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 187e301ed244f2822c20844fede6e636049abf32..6a752f972524d591f809910438c7f31ca96e76e4 100644 (file)
--- 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 <blogic@openwrt.org>
 +      int tx_irq;
 +      int rx_irq;
 +
 +      int tx_irq;
 +      int rx_irq;
 +

-+      const void *mac;
++      unsigned char mac[6];

 +      int mii_mode;
  
        spinlock_t lock;
 +      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 04c2071f320ce76876a5128b69861050621f07ff..094d16c5c9d210856c5155fd901d01641123a64a 100644 (file)
--- 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 <blogic@openwrt.org>
 +device_initcall(of_ralink_eeprom_init);
 --- a/drivers/net/ethernet/lantiq_etop.c
 +++ b/drivers/net/ethernet/lantiq_etop.c
 +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;
 @@ -840,7 +840,11 @@ ltq_etop_init(struct net_device *dev)
        if (err)
                goto err_hw;