diff options
| author | John Crispin <john@openwrt.org> | 2015-07-07 13:44:12 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-07-07 13:44:12 +0000 |
| commit | fa9e259729b7d236d58ec2af82e699909d41ea4c (patch) | |
| tree | b2cb9a90b7122e5511074b0e77fceb1e1862d825 /target/linux/lantiq | |
| parent | 4c8227539e608a0c118f0985b56f39a7ce979a76 (diff) | |
| download | upstream-fa9e259729b7d236d58ec2af82e699909d41ea4c.tar.gz upstream-fa9e259729b7d236d58ec2af82e699909d41ea4c.tar.bz2 upstream-fa9e259729b7d236d58ec2af82e699909d41ea4c.zip | |
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
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0028-NET-lantiq-various-etop-fixes.patch | 2 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 9 |
2 files changed, 1 insertions, 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 187e301ed2..6a752f9725 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 <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-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 04c2071f32..094d16c5c9 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 <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; |