diff options
| author | John Crispin <blogic@openwrt.org> | 2015-10-05 10:28:07 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-10-05 10:28:07 +0000 |
| commit | df855a498e296b7db0143d478d6940bd608b8a3c (patch) | |
| tree | 782799eecd5742c7dc663a02edbc239af83c963a | |
| parent | d1cb6187ccaba53cdc8da626a2116dd16eca0154 (diff) | |
| download | master-187ad058-df855a498e296b7db0143d478d6940bd608b8a3c.tar.gz master-187ad058-df855a498e296b7db0143d478d6940bd608b8a3c.tar.bz2 master-187ad058-df855a498e296b7db0143d478d6940bd608b8a3c.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47128 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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; |