Author: blogic Date: 2015-10-05 12:28:07 +0200 (Mon, 05 Oct 2015) New Revision: 47128
Modified: trunk/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch trunk/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch Log: 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 <[email protected]> Modified: trunk/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch =================================================================== --- trunk/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch 2015-10-05 10:27:55 UTC (rev 47127) +++ trunk/target/linux/lantiq/patches-4.1/0028-NET-lantiq-various-etop-fixes.patch 2015-10-05 10:28:07 UTC (rev 47128) @@ -170,7 +170,7 @@ + int tx_irq; + int rx_irq; + -+ const void *mac; ++ unsigned char mac[6]; + int mii_mode; spinlock_t lock; Modified: trunk/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch =================================================================== --- trunk/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch 2015-10-05 10:27:55 UTC (rev 47127) +++ trunk/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch 2015-10-05 10:28:07 UTC (rev 47128) @@ -590,15 +590,6 @@ +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; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
