X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9216cb59ec69572d427815429ecc9c2745c3b919..6f3ddb2a95148c3ba510537d64d047997f7d75bd:/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch

diff --git a/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch b/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch
index 58c697ee2..11329910e 100644
--- a/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch
+++ b/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch
@@ -1,6 +1,6 @@
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c	2005-07-10 04:06:50.491302256 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.c	2005-07-12 02:48:41.996601000 +0200
 @@ -0,0 +1,728 @@
 +#ifndef _INC_CPCOMMON_C
 +#define _INC_CPCOMMON_C
@@ -732,7 +732,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.c linux.dev/drive
 +#endif  /* _INC  */
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h	2005-07-10 03:22:40.508160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpcommon_cpmac.h	2005-07-12 02:48:41.996601000 +0200
 @@ -0,0 +1,79 @@
 +#ifndef _INC_CPCOMMON_H
 +#define _INC_CPCOMMON_H
@@ -815,8 +815,8 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h linux.dev/drive
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmac.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c	2005-07-10 07:39:15.514764184 +0200
-@@ -0,0 +1,2509 @@
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c	2005-07-22 01:03:12.609318544 +0200
+@@ -0,0 +1,2504 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Network Device Driver Source
 + ******************************************************************************
@@ -1774,9 +1774,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        dbgPrint("Maintaining the link up loopback for %s.\n", p_dev->name);
 +	netif_carrier_on(p_dev);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
++//#endif
 +
 +        return(0);
 +    }
@@ -1791,9 +1791,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +	{
 +            netif_carrier_on(p_cpmac_priv->owner);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
++//#endif
 +	    dbgPrint("Found the Link for the CPMAC instance %s.\n", p_dev->name);
 +        }
 +
@@ -1816,9 +1816,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +
 +	    netif_carrier_off(p_dev);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//            avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
++//#endif
 +
 +	    dbgPrint("Lost the Link for the CPMAC for %s.\n", p_dev->name);
 +	}
@@ -2307,13 +2307,13 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +    p_cpmac_priv->set_to_close          = 1;
 +    p_cpmac_priv->non_data_irq_expected = 0;
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    if((p_cpmac_priv->led_handle = avalanche_led_register("cpmac", instance_num)) == NULL)
-+    {
-+        errPrint("Could not allocate handle for CPMAC[%d] LED.\n", instance_num);
-+        goto cpmac_init_mod_error;
-+    }
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    if((p_cpmac_priv->led_handle = avalanche_led_register("cpmac", instance_num)) == NULL)
++//   {
++//        errPrint("Could not allocate handle for CPMAC[%d] LED.\n", instance_num);
++//       goto cpmac_init_mod_error;
++//    }
++//#endif
 +
 +    if(cpmac_drv_init_module(p_drv_hal, p_dev, instance_num) != 0)
 +    {
@@ -2365,9 +2365,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +
 +    netif_carrier_off(p_dev);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
++//#endif
 +
 +    /* Tasklet is initialized at the isr registeration time. */
 +    p_drv_hal->hal_funcs->Control(p_drv_hal->hal_dev, "CpmacBase", "Get", &p_dev->base_addr);
@@ -2517,9 +2517,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        p_cpmac_priv->link_mode         = 1;
 +        netif_carrier_off(p_dev);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//        avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_OFF);
++//#endif
 +
 +        clear_bit(0, &p_cpmac_priv->non_data_irq_expected);
 +
@@ -2570,10 +2570,10 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +    int                     val           = 1;
 +    int                     channel       = 0;
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)    
-+    if(netif_carrier_ok(p_dev))
-+       avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)    
++//    if(netif_carrier_ok(p_dev))
++//      avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_LINK_ON);
++//#endif
 +
 +    if(p_dev->flags & IFF_PROMISC)
 +    {
@@ -2739,9 +2739,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        goto cpmac_dev_tx_drop_pkt; 
 +    }
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_TX_ACTIVITY);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_TX_ACTIVITY);
++//#endif
 +
 +    return(ret_val);
 +
@@ -2902,7 +2902,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        /* OS Needs to supply CORRECT frequency */
 +        if(cpmac_ci_strcmp(action, "Get") == 0 && value != NULL)
 +        {
-+            *(unsigned int *)value = CONFIG_AR7_SYS_FREQUENCY * 1000 * 1000;
++            *(unsigned int *)value = CONFIG_AR7_SYS * 1000 * 1000;
 +            ret_val = 0;
 +        }
 +    }
@@ -2921,7 +2921,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +        /* For Sangam MdioBusFreq is off the PBUS */
 +        if(cpmac_ci_strcmp(action, "Get") == 0 && value != NULL)
 +        {
-+            *(unsigned int *)value = CONFIG_AR7_SYS_FREQUENCY * 1000 * 1000;
++            *(unsigned int *)value = CONFIG_AR7_SYS * 1000 * 1000;
 +            ret_val = 0;
 +        }
 +    }
@@ -3035,18 +3035,13 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +    skb_trim(p_skb, packet_size);                                                                                            
 +#endif 
 + 
-+#ifndef TI_SLOW_PATH
-+    /* TI Optimization: This is NOT required if the ethernet resides below the bridge. But is
-+    * required only if the ethernet is directly connected to the IP stack. */
-+    if (p_dev->br_port == NULL)   
-+#endif
-+       p_skb->protocol = eth_type_trans(p_skb, p_dev);
++    p_skb->protocol = eth_type_trans(p_skb, p_dev);
 +
 +    netif_rx(p_skb);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_RX_ACTIVITY);	
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//    avalanche_led_action(p_cpmac_priv->led_handle, CPMAC_RX_ACTIVITY);	
++//#endif
 +
 +    p_cpmac_priv->net_dev_stats.rx_packets++;
 +    p_cpmac_priv->net_dev_stats.rx_bytes += packet_size;
@@ -3148,7 +3143,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +    int     instance_count = CONFIG_MIPS_CPMAC_PORTS;
 +
 +    //cpmac_cpu_freq = avalanche_clkc_get_freq(CLKC_MIPS);
-+    cpmac_cpu_freq = CONFIG_AR7_CPU_FREQUENCY * 1000 * 1000;
++    cpmac_cpu_freq = CONFIG_AR7_CPU * 1000 * 1000;
 +
 +    build_psp_config();                       
 +
@@ -3294,9 +3289,9 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +      
 +        cpmac_drv_cleanup(p_cpmac_priv->drv_hal);
 +
-+#if defined (CONFIG_MIPS_AVALANCHE_LED)
-+        avalanche_led_unregister(p_cpmac_priv->led_handle);
-+#endif
++//#if defined (CONFIG_MIPS_AVALANCHE_LED)
++//        avalanche_led_unregister(p_cpmac_priv->led_handle);
++//#endif
 +	strcpy(proc_name, "avalanche/");
 +        strcat(proc_name, p_dev->name);
 +        proc_category_name_len = strlen(proc_name);
@@ -3328,7 +3323,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av
 +module_exit(cpmac_exit);
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmac.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmac.h	2005-07-10 03:22:40.511160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac.h	2005-07-12 02:48:42.043594000 +0200
 @@ -0,0 +1,379 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Network Device Driver Header
@@ -3711,7 +3706,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.h linux.dev/drivers/net/av
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c	2005-07-10 04:06:50.491302256 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.c	2005-07-12 02:48:42.044593000 +0200
 @@ -0,0 +1,492 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Net Driver HAL support Source
@@ -4207,7 +4202,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.c linux.dev/drivers/n
 +}
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h	2005-07-10 03:22:40.512160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmacHalLx.h	2005-07-12 02:48:42.044593000 +0200
 @@ -0,0 +1,51 @@
 +/******************************************************************************
 + * FILE PURPOSE:    CPMAC Linux Device Driver HAL support Header
@@ -4262,7 +4257,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmacHalLx.h linux.dev/drivers/n
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h	2005-07-10 03:22:40.513160000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac_reg.h	2005-07-12 02:48:42.045593000 +0200
 @@ -0,0 +1,406 @@
 +/****************************************************************************
 +        TNETD73xx Software Support
@@ -4672,7 +4667,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac_reg.h linux.dev/drivers/ne
 +#endif _INC_CPMAC_REG
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.c linux.dev/drivers/net/avalanche_cpmac/cpmdio.c
 --- linux.old/drivers/net/avalanche_cpmac/cpmdio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.c	2005-07-10 04:06:50.491302256 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.c	2005-07-12 02:48:42.046593000 +0200
 @@ -0,0 +1,960 @@
 +/***************************************************************************
 +**  TNETD53xx Software Support
@@ -5636,7 +5631,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.c linux.dev/drivers/net/a
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.h linux.dev/drivers/net/avalanche_cpmac/cpmdio.h
 --- linux.old/drivers/net/avalanche_cpmac/cpmdio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.h	2005-07-10 03:22:40.515159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmdio.h	2005-07-12 02:48:42.047593000 +0200
 @@ -0,0 +1,73 @@
 +/*****************************************************************************
 +**      TNETD53xx Software Support
@@ -5713,7 +5708,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmdio.h linux.dev/drivers/net/a
 +#endif  /*  _INC_CPMDIO */
 diff -urN linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c	2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cppi_cpmac.c	2005-07-12 02:48:42.048593000 +0200
 @@ -0,0 +1,1345 @@
 +/*************************************************************************
 + *  TNETDxxxx Software Support
@@ -7062,7 +7057,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cppi_cpmac.c linux.dev/drivers/n
 +  }
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c	2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpremap_cpmac.c	2005-07-12 02:48:42.049593000 +0200
 @@ -0,0 +1,28 @@
 +#ifndef _INC_CPREMAP_C
 +#define _INC_CPREMAP_C
@@ -7094,7 +7089,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpremap_cpmac.c linux.dev/driver
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h	2005-07-10 03:22:40.518159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpswhal_cpmac.h	2005-07-12 02:48:42.050593000 +0200
 @@ -0,0 +1,632 @@
 +/************************************************************************
 + *  TNETDxxxx Software Support
@@ -7730,7 +7725,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpswhal_cpmac.h linux.dev/driver
 +#endif  /*  end of _INC_    */
 diff -urN linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h	2005-07-10 03:22:40.519159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/dox_cpmac.h	2005-07-12 02:48:42.050593000 +0200
 @@ -0,0 +1,842 @@
 +/*****************************************************************************
 + *  TNETDxxxx Software Support
@@ -8576,7 +8571,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/dox_cpmac.h linux.dev/drivers/ne
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h	2005-07-10 03:22:40.519159000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/ec_errors_cpmac.h	2005-07-12 02:48:42.051592000 +0200
 @@ -0,0 +1,118 @@
 +/***************************************************************************
 + Copyright(c) 2001, Texas Instruments Incorporated. All Rights Reserved.
@@ -8698,7 +8693,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/ec_errors_cpmac.h linux.dev/driv
 +#endif /* _INC_EC_ERRORS */
 diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.c linux.dev/drivers/net/avalanche_cpmac/hcpmac.c
 --- linux.old/drivers/net/avalanche_cpmac/hcpmac.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.c	2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.c	2005-07-12 02:48:42.174574000 +0200
 @@ -0,0 +1,1878 @@
 +/******************************************************************************
 + *  TNETDxxxx Software Support
@@ -10580,7 +10575,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.c linux.dev/drivers/net/a
 +}
 diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.h linux.dev/drivers/net/avalanche_cpmac/hcpmac.h
 --- linux.old/drivers/net/avalanche_cpmac/hcpmac.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.h	2005-07-10 03:22:40.522158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/hcpmac.h	2005-07-12 02:48:42.175574000 +0200
 @@ -0,0 +1,383 @@
 +/** @file***********************************************************************
 + *  TNETDxxxx Software Support
@@ -10967,7 +10962,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/hcpmac.h linux.dev/drivers/net/a
 +#endif
 diff -urN linux.old/drivers/net/avalanche_cpmac/Makefile linux.dev/drivers/net/avalanche_cpmac/Makefile
 --- linux.old/drivers/net/avalanche_cpmac/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/Makefile	2005-07-10 03:22:40.522158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/Makefile	2005-07-12 02:48:42.175574000 +0200
 @@ -0,0 +1,26 @@
 +# File: drivers/net/avalanche_cpmac/Makefile
 +#
@@ -10997,7 +10992,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/Makefile linux.dev/drivers/net/a
 +	rm -f core *.o *.a *.s
 diff -urN linux.old/drivers/net/avalanche_cpmac/mdio_reg.h linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h
 --- linux.old/drivers/net/avalanche_cpmac/mdio_reg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h	2005-07-10 03:22:40.522158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/mdio_reg.h	2005-07-12 02:48:42.176573000 +0200
 @@ -0,0 +1,121 @@
 +/****************************************************************************
 +**      TNETD53xx Software Support
@@ -11122,7 +11117,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/mdio_reg.h linux.dev/drivers/net
 +#endif _INC_MDIO_REG
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_build.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c	2005-07-10 07:31:18.203326552 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.c	2005-07-12 02:48:42.176573000 +0200
 @@ -0,0 +1,335 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Configuration Build Source
@@ -11176,7 +11171,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/dri
 +    unsigned int j= 0, detected_phy_map = 0, auto_select = SELECT_INT_PHY_MAC;
 +                                                                                                                   
 +    *reset_cntl |= (1 << AVALANCHE_MDIO_RESET_BIT) | (1 << AVALANCHE_LOW_CPMAC_RESET_BIT) | (1 << AVALANCHE_HIGH_CPMAC_RESET_BIT) | (1 << AVALANCHE_LOW_EPHY_RESET_BIT);                                 
-+    *mdio_cntl   = (1 << 30) | ((CONFIG_AR7_SYS_FREQUENCY * 1000)/2200);                                              
++    *mdio_cntl   = (1 << 30) | ((CONFIG_AR7_SYS * 1000)/2200);                                              
 +                                                                                                                   
 +    for(j=0;j < 300000; j++) 
 +    { 
@@ -11461,7 +11456,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.c linux.dev/dri
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.h linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_build.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h	2005-07-10 03:22:40.523158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_build.h	2005-07-12 02:48:42.176573000 +0200
 @@ -0,0 +1,138 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Configuration Build Header
@@ -11603,7 +11598,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_build.h linux.dev/dri
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c	2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.c	2005-07-12 02:48:42.177573000 +0200
 @@ -0,0 +1,464 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager Source
@@ -12071,7 +12066,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.c linux.dev/drive
 +}                                                                               
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h	2005-07-10 03:22:40.525158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_mgr.h	2005-07-12 02:48:42.177573000 +0200
 @@ -0,0 +1,110 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager Header
@@ -12185,7 +12180,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_mgr.h linux.dev/drive
 +#endif /* __PSP_CONFIG_MGR_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c	2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.c	2005-07-12 02:48:42.178573000 +0200
 @@ -0,0 +1,362 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Parse API Source
@@ -12551,7 +12546,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.c linux.dev/dri
 +
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h	2005-07-10 03:22:40.526158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_parse.h	2005-07-12 02:48:42.178573000 +0200
 @@ -0,0 +1,32 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Parse API Header
@@ -12587,7 +12582,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_parse.h linux.dev/dri
 +#endif /* __PSP_CONFIG_PARSER_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.c linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c	2005-07-10 04:06:50.492302104 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.c	2005-07-12 02:48:42.178573000 +0200
 @@ -0,0 +1,106 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Utilities API Source
@@ -12697,7 +12692,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.c linux.dev/driv
 +#endif /* PSP_CONFIG_MGR_DEBUG_TEST */
 diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.h linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h
 --- linux.old/drivers/net/avalanche_cpmac/psp_config_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h	2005-07-10 03:22:40.526158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/psp_config_util.h	2005-07-12 02:48:42.179573000 +0200
 @@ -0,0 +1,26 @@
 +/******************************************************************************
 + * FILE PURPOSE:    PSP Config Manager - Utilities API Header
@@ -12727,7 +12722,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/psp_config_util.h linux.dev/driv
 +#endif /* __PSP_CONFIG_UTIL_H__ */
 diff -urN linux.old/drivers/net/avalanche_cpmac/readme.txt linux.dev/drivers/net/avalanche_cpmac/readme.txt
 --- linux.old/drivers/net/avalanche_cpmac/readme.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/avalanche_cpmac/readme.txt	2005-07-10 03:22:40.527158000 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/readme.txt	2005-07-12 02:48:42.179573000 +0200
 @@ -0,0 +1,545 @@
 +23 August 2004      CPMAC 1.7.8 (NSP Performance Team Release)
 +
@@ -13275,8 +13270,8 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/readme.txt linux.dev/drivers/net
 +RC2              9524                 32%
 +RC3             15190                 51%
 diff -urN linux.old/drivers/net/Config.in linux.dev/drivers/net/Config.in
---- linux.old/drivers/net/Config.in	2005-07-10 03:24:49.242590320 +0200
-+++ linux.dev/drivers/net/Config.in	2005-07-10 03:22:40.527158000 +0200
+--- linux.old/drivers/net/Config.in	2005-07-12 03:20:45.726149872 +0200
++++ linux.dev/drivers/net/Config.in	2005-07-12 02:48:42.180573000 +0200
 @@ -25,6 +25,24 @@
  comment 'Ethernet (10 or 100Mbit)'
  bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
@@ -13303,8 +13298,8 @@ diff -urN linux.old/drivers/net/Config.in linux.dev/drivers/net/Config.in
        dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110
        tristate '  Cirrus Logic CS8900A support' CONFIG_ARM_CIRRUS
 diff -urN linux.old/drivers/net/Makefile linux.dev/drivers/net/Makefile
---- linux.old/drivers/net/Makefile	2005-07-10 03:24:49.243590168 +0200
-+++ linux.dev/drivers/net/Makefile	2005-07-10 03:22:40.528157000 +0200
+--- linux.old/drivers/net/Makefile	2005-07-12 03:20:45.726149872 +0200
++++ linux.dev/drivers/net/Makefile	2005-07-12 02:48:42.181573000 +0200
 @@ -56,6 +56,16 @@
  subdir-$(CONFIG_BONDING) += bonding
  
@@ -13322,3 +13317,25 @@ diff -urN linux.old/drivers/net/Makefile linux.dev/drivers/net/Makefile
  # link order important here
  #
  obj-$(CONFIG_PLIP) += plip.o
+--- linux.old/drivers/net/avalanche_cpmac/cpmac.c	2005-08-25 10:56:33.702931008 +0200
++++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c	2005-08-25 11:08:45.027451520 +0200
+@@ -2158,17 +2158,16 @@
+     CPMAC_PRIVATE_INFO_T *p_cpmac_priv  = p_dev->priv;
+     CPMAC_DRV_HAL_INFO_T *p_drv_hal     = p_cpmac_priv->drv_hal;
+     struct sk_buff       *p_skb         = fragList[0].OsInfo;
+-    p_skb->len                          = fragList[0].len;    
+ 
+     /* invalidate the cache. */
+     dma_cache_inv((unsigned long)p_skb->data, fragList[0].len);    
+ #ifdef CPMAC_TEST
+-    xdump(p_skb->data, p_skb->len, "recv");
++    xdump(p_skb->data, fragList[0].len, "recv");
+ #endif
+ #ifdef CPMAC_8021Q_SUPPORT
+     /* 802.1q stuff, just does the basic checking here. */
+     if(!p_cpmac_priv->enable_802_1q      &&
+-       p_skb->len > TCI_END_OFFSET       &&
++       fragList[0].len > TCI_END_OFFSET       &&
+        IS_802_1Q_FRAME(p_skb->data + TPID_START_OFFSET))
+     {
+          goto cpmac_hal_recv_frame_mismatch;