KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: 47128
This commit is contained in:
John Crispin 2015-10-05 10:28:07 +00:00
parent cea7c66ef8
commit c5cc3d9610
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch
View file

@ -170,7 +170,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ int tx_irq; + int tx_irq;
+ int rx_irq; + int rx_irq;
+ +
+ const void *mac; + unsigned char mac[6];
+ int mii_mode; + int mii_mode;
spinlock_t lock; spinlock_t lock;

9
target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
View file

@ -590,15 +590,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+device_initcall(of_ralink_eeprom_init); +device_initcall(of_ralink_eeprom_init);
--- a/drivers/net/ethernet/lantiq_etop.c --- a/drivers/net/ethernet/lantiq_etop.c
+++ b/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) @@ -840,7 +840,11 @@ ltq_etop_init(struct net_device *dev)
if (err) if (err)
goto err_hw; goto err_hw;