diff options
3 files changed, 7 insertions, 22 deletions
diff --git a/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch index 657f96c7b9..1bd445b2a7 100644 --- a/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch @@ -33,7 +33,7 @@ +obj-$(CONFIG_NET_AR231X) += ar231x.o --- /dev/null +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c -@@ -0,0 +1,1231 @@ +@@ -0,0 +1,1218 @@ +/* + * ar231x.c: Linux driver for the Atheros AR231x Ethernet device. + * @@ -55,39 +55,26 @@ + */ + +#include <linux/module.h> -+#include <linux/version.h> +#include <linux/types.h> +#include <linux/errno.h> +#include <linux/ioport.h> -+#include <linux/pci.h> +#include <linux/netdevice.h> +#include <linux/etherdevice.h> +#include <linux/interrupt.h> -+#include <linux/hardirq.h> +#include <linux/skbuff.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/mm.h> -+#include <linux/highmem.h> -+#include <linux/sockios.h> -+#include <linux/pkt_sched.h> +#include <linux/mii.h> +#include <linux/phy.h> -+#include <linux/ethtool.h> -+#include <linux/ctype.h> +#include <linux/platform_device.h> +#include <linux/io.h> -+#include <linux/uaccess.h> -+ -+#include <net/sock.h> -+#include <net/ip.h> + +#define AR2313_MTU 1692 +#define AR2313_PRIOS 1 +#define AR2313_QUEUES (2*AR2313_PRIOS) +#define AR2313_DESCR_ENTRIES 64 + -+ +#ifndef min +#define min(a, b) (((a) < (b)) ? (a) : (b)) +#endif diff --git a/target/linux/atheros/patches-3.14/120-spiflash.patch b/target/linux/atheros/patches-3.14/120-spiflash.patch index 8dbab1052b..5fe86cbc0b 100644 --- a/target/linux/atheros/patches-3.14/120-spiflash.patch +++ b/target/linux/atheros/patches-3.14/120-spiflash.patch @@ -23,7 +23,7 @@ --- /dev/null +++ b/drivers/mtd/devices/ar2315.c -@@ -0,0 +1,461 @@ +@@ -0,0 +1,459 @@ + +/* + * MTD driver for the SPI Flash Memory support on Atheros AR2315 @@ -43,14 +43,12 @@ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/types.h> -+#include <linux/version.h> +#include <linux/errno.h> +#include <linux/slab.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> +#include <linux/platform_device.h> +#include <linux/sched.h> -+#include <linux/root_dev.h> +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/mutex.h> diff --git a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch index 766ec8d409..3d3949bb9d 100644 --- a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch +++ b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/ar231x/ar231x.c +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c -@@ -148,6 +148,7 @@ static int ar231x_mdiobus_write(struct m +@@ -135,6 +135,7 @@ static int ar231x_mdiobus_write(struct m static int ar231x_mdiobus_reset(struct mii_bus *bus); static int ar231x_mdiobus_probe(struct net_device *dev); static void ar231x_adjust_link(struct net_device *dev); @@ -8,7 +8,7 @@ #ifndef ERR #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args) -@@ -180,6 +181,32 @@ static const struct net_device_ops ar231 +@@ -167,6 +168,32 @@ static const struct net_device_ops ar231 #endif }; @@ -41,7 +41,7 @@ static int ar231x_probe(struct platform_device *pdev) { struct net_device *dev; -@@ -286,6 +313,24 @@ static int ar231x_probe(struct platform_ +@@ -273,6 +300,24 @@ static int ar231x_probe(struct platform_ mdiobus_register(sp->mii_bus); @@ -66,7 +66,7 @@ if (ar231x_mdiobus_probe(dev) != 0) { printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name); rx_tasklet_cleanup(dev); -@@ -343,8 +388,10 @@ static int ar231x_remove(struct platform +@@ -330,8 +375,10 @@ static int ar231x_remove(struct platform rx_tasklet_cleanup(dev); ar231x_init_cleanup(dev); unregister_netdev(dev); @@ -79,7 +79,7 @@ kfree(dev); return 0; } -@@ -1103,6 +1150,9 @@ static int ar231x_ioctl(struct net_devic +@@ -1090,6 +1137,9 @@ static int ar231x_ioctl(struct net_devic { struct ar231x_private *sp = netdev_priv(dev); |