diff options
| author | John Crispin <john@openwrt.org> | 2015-10-05 10:28:07 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-10-05 10:28:07 +0000 |
| commit | c5cc3d96109aa5aba2600b159c8f52669285e9e3 (patch) | |
| tree | 8fd63b1d97f533d5713f486e147c3eef304d8a1a /target/linux/lantiq | |
| parent | cea7c66ef873f1f5912aa2ea3305acf8ac61f6f4 (diff) | |
| download | upstream-c5cc3d96109aa5aba2600b159c8f52669285e9e3.tar.gz upstream-c5cc3d96109aa5aba2600b159c8f52669285e9e3.tar.bz2 upstream-c5cc3d96109aa5aba2600b159c8f52669285e9e3.zip | |
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: 47128
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch | 2 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 9 |
2 files changed, 1 insertions, 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 e0421e98a8..3301264a17 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@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 72ae1c92f3..ec769ccf63 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@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; |