Ignore:
Timestamp:
2012-05-06T19:08:30+02:00 (4 years ago)
Author:
nbd
Message:

atheros: update to 3.3.4 (based on work by acoul), fix mvswitch driver for newer kernels

Location:
trunk/target/linux/atheros/patches-3.3
Files:
1 added
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch

    r31623 r31625  
    1 --- a/drivers/net/Kconfig 
    2 +++ b/drivers/net/Kconfig 
    3 @@ -251,6 +251,12 @@ config AX88796_93CX6 
    4         help 
    5           Select this if your platform comes with an external 93CX6 eeprom. 
    6   
    7 +config AR231X_ETHERNET 
    8 +       tristate "AR231x Ethernet support" 
     1--- a/drivers/net/ethernet/Kconfig 
     2+++ b/drivers/net/ethernet/Kconfig 
     3@@ -22,6 +22,7 @@ source "drivers/net/ethernet/adaptec/Kco 
     4 source "drivers/net/ethernet/aeroflex/Kconfig" 
     5 source "drivers/net/ethernet/alteon/Kconfig" 
     6 source "drivers/net/ethernet/amd/Kconfig" 
     7+source "drivers/net/ethernet/ar231x/Kconfig" 
     8 source "drivers/net/ethernet/apple/Kconfig" 
     9 source "drivers/net/ethernet/atheros/Kconfig" 
     10 source "drivers/net/ethernet/cadence/Kconfig" 
     11--- a/drivers/net/ethernet/Makefile 
     12+++ b/drivers/net/ethernet/Makefile 
     13@@ -9,6 +9,7 @@ obj-$(CONFIG_GRETH) += aeroflex/ 
     14 obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/ 
     15 obj-$(CONFIG_NET_VENDOR_AMD) += amd/ 
     16 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ 
     17+obj-$(CONFIG_NET_VENDOR_AR231X) += ar231x/ 
     18 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ 
     19 obj-$(CONFIG_NET_CADENCE) += cadence/ 
     20 obj-$(CONFIG_NET_BFIN) += adi/ 
     21--- /dev/null 
     22+++ b/drivers/net/ethernet/ar231x/Kconfig 
     23@@ -0,0 +1,5 @@ 
     24+config NET_VENDOR_AR231X 
     25+       tristate "AR231X Ethernet support" 
    926+       depends on ATHEROS_AR231X 
    1027+       help 
    1128+         Support for the AR231x/531x ethernet controller 
    12 + 
    13  config MACE 
    14         tristate "MACE (Power Mac ethernet) support" 
    15         depends on PPC_PMAC && PPC32 
    16 --- a/drivers/net/Makefile 
    17 +++ b/drivers/net/Makefile 
    18 @@ -224,6 +224,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o 
    19  obj-$(CONFIG_KORINA) += korina.o 
    20  obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o 
    21  obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o 
    22 +obj-$(CONFIG_AR231X_ETHERNET) += ar231x.o 
    23  obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o 
    24  obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o 
    25  obj-$(CONFIG_DECLANCE) += declance.o 
    2629--- /dev/null 
    27 +++ b/drivers/net/ar231x.c 
    28 @@ -0,0 +1,1293 @@ 
     30+++ b/drivers/net/ethernet/ar231x/Makefile 
     31@@ -0,0 +1 @@ 
     32+obj-$(CONFIG_NET_VENDOR_AR231X) += ar231x.o 
     33--- /dev/null 
     34+++ b/drivers/net/ethernet/ar231x/ar231x.c 
     35@@ -0,0 +1,1282 @@ 
    2936+/* 
    3037+ * ar231x.c: Linux driver for the Atheros AR231x Ethernet device. 
     
    5562+#include <linux/netdevice.h> 
    5663+#include <linux/etherdevice.h> 
     64+#include <linux/interrupt.h> 
     65+#include <linux/hardirq.h> 
    5766+#include <linux/skbuff.h> 
    5867+#include <linux/init.h> 
     
    210219+}; 
    211220+ 
    212 +int __init ar231x_probe(struct platform_device *pdev) 
     221+int __devinit ar231x_probe(struct platform_device *pdev) 
    213222+{ 
    214223+       struct net_device *dev; 
     
    416425+}; 
    417426+ 
    418 +int __init ar231x_module_init(void) 
    419 +{ 
    420 +       return platform_driver_register(&ar231x_driver); 
    421 +} 
    422 + 
    423 +void __exit ar231x_module_cleanup(void) 
    424 +{ 
    425 +       platform_driver_unregister(&ar231x_driver); 
    426 +} 
    427 + 
    428 +module_init(ar231x_module_init); 
    429 +module_exit(ar231x_module_cleanup); 
    430 + 
     427+module_platform_driver(ar231x_driver); 
    431428+ 
    432429+static void ar231x_free_descriptors(struct net_device *dev) 
     
    11721169+static int ar231x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
    11731170+{ 
    1174 +       struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data; 
    11751171+       struct ar231x_private *sp = netdev_priv(dev); 
    11761172+       int ret; 
     
    13211317+ 
    13221318--- /dev/null 
    1323 +++ b/drivers/net/ar231x.h 
    1324 @@ -0,0 +1,302 @@ 
     1319+++ b/drivers/net/ethernet/ar231x/ar231x.h 
     1320@@ -0,0 +1,303 @@ 
    13251321+/* 
    13261322+ * ar231x.h: Linux driver for the Atheros AR231x Ethernet device. 
     
    13421338+#define _AR2313_H_ 
    13431339+ 
     1340+#include <linux/interrupt.h> 
    13441341+#include <generated/autoconf.h> 
    13451342+#include <linux/bitops.h> 
Note: See TracChangeset for help on using the changeset viewer.