mirror of https://github.com/hak5/openwrt.git
lantiq: Change the data-type of mac address in ETOP driver
This adds the changes from r46219 to the linux 4.1 patches as well. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 47128lede-17.01
parent
cea7c66ef8
commit
c5cc3d9610
|
@ -170,7 +170,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
+ int tx_irq;
|
||||
+ int rx_irq;
|
||||
+
|
||||
+ const void *mac;
|
||||
+ unsigned char mac[6];
|
||||
+ int mii_mode;
|
||||
|
||||
spinlock_t lock;
|
||||
|
|
|
@ -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
|
||||
@@ -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;
|
||||
|
|
Loading…
Reference in New Issue