merge of 482d0ac7ec1cff34c9fc7affc4b051abafb85e03

     and df1198a3d060cad27956be1a6653a6556adfe9dd

4 files changed, 98 insertions, 2 deletions

diff --git a/packages/ixp425-eth/ixp400-eth-1.5/params.patch b/packages/ixp425-eth/ixp400-eth-1.5/params.patch
new file mode 100644
index 0000000000..2267a48fec
--- /dev/null
+++ b/packages/ixp425-eth/ixp400-eth-1.5/params.patch
@@ -0,0 +1,75 @@
+*** ixp/ixp400_eth.c.orig	Wed Jun  7 21:31:59 2006
+--- ixp/ixp400_eth.c	Fri Jun  9 14:55:18 2006
+***************
+*** 112,135 ****
+  #define MOD_VERSION "1.5"
+  
+  /* Module parameters */
+! static int npe_learning = 1;      /* default : NPE learning & filtering enable */
+! static int log_level = 0;         /* default : no log */
+! static int no_ixp400_sw_init = 0; /* default : init core components of the IXP400 Software */
+! static int no_phy_scan = 0;       /* default : do phy discovery */
+! static int phy_reset = 0;         /* default : mo phy reset */
+  
+  /* maximum number of ports supported by this driver ixp0, ixp1 ....
+   * The default is to configure all ports defined in EthAcc component
+  */
+  #ifdef CONFIG_IXP400_ETH_NPEC_ONLY
+! static int dev_max_count = 1; /* only NPEC is used */
+! #elif defined (CONFIG_IXP400_ETH_NPEB_ONLY)
+! static int dev_max_count = 1; /* only NPEB is used */
+  #elif defined (CONFIG_ARCH_IXDP425) || defined(CONFIG_ARCH_IXDPG425)\
+        || defined (CONFIG_ARCH_ADI_COYOTE)
+! static int dev_max_count = 2; /* only NPEB and NPEC */
+  #elif defined (CONFIG_ARCH_IXDP465) || defined(CONFIG_MACH_IXDP465)
+! static int dev_max_count = 3; /* all NPEs are used */
+  #endif
+  
+  #ifndef CONFIG_IXP400_NAPI
+--- 112,136 ----
+  #define MOD_VERSION "1.5"
+  
+  /* Module parameters */
+! /* gcc 4.1.1+kernel2.6.16 do not like it if these are static! */
+! int npe_learning = 1;      /* default : NPE learning & filtering enable */
+! int log_level = 0;         /* default : no log */
+! int no_ixp400_sw_init = 0; /* default : init core components of the IXP400 Software */
+! int no_phy_scan = 0;       /* default : do phy discovery */
+! int phy_reset = 0;         /* default : mo phy reset */
+  
+  /* maximum number of ports supported by this driver ixp0, ixp1 ....
+   * The default is to configure all ports defined in EthAcc component
+  */
+  #ifdef CONFIG_IXP400_ETH_NPEC_ONLY
+! int dev_max_count = 1; /* only NPEC is used */
+! elif defined (CONFIG_IXP400_ETH_NPEB_ONLY)
+! int dev_max_count = 1; /* only NPEB is used */
+  #elif defined (CONFIG_ARCH_IXDP425) || defined(CONFIG_ARCH_IXDPG425)\
+        || defined (CONFIG_ARCH_ADI_COYOTE)
+! int dev_max_count = 2; /* only NPEB and NPEC */
+  #elif defined (CONFIG_ARCH_IXDP465) || defined(CONFIG_MACH_IXDP465)
+! int dev_max_count = 3; /* all NPEs are used */
+  #endif
+  
+  #ifndef CONFIG_IXP400_NAPI
+***************
+*** 138,146 ****
+   * skbuf to push into the linux stack, and avoid the performance degradations 
+   * during overflow.
+   */
+! static int ixp400_netdev_max_backlog = 290;
+  
+! static int datapath_poll = 1;     /* default : rx/tx polling, not interrupt driven*/
+  
+  MODULE_PARM(ixp400_netdev_max_backlog, "i");
+  MODULE_PARM_DESC(ixp400_netdev_max_backlog, "Should be set to the value of /proc/sys/net/core/netdev_max_backlog (perf affecting)");
+--- 139,147 ----
+   * skbuf to push into the linux stack, and avoid the performance degradations 
+   * during overflow.
+   */
+! int ixp400_netdev_max_backlog = 290;
+  
+! int datapath_poll = 1;     /* default : rx/tx polling, not interrupt driven*/
+  
+  MODULE_PARM(ixp400_netdev_max_backlog, "i");
+  MODULE_PARM_DESC(ixp400_netdev_max_backlog, "Should be set to the value of /proc/sys/net/core/netdev_max_backlog (perf affecting)");
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index dabb2b1440..493ee42137 100644
--- a/packages/ixp425-eth/ixp400-eth_1.5.bb
+++ b/packages/ixp425-eth/ixp400-eth_1.5.bb
@@ -4,7 +4,7 @@
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
 LICENSE = "GPL"
-PR = "r11"
+PR = "r12"
 
 DEPENDS = "ixp-osal"
 DEPENDS = "ixp4xx-csr"
@@ -22,6 +22,7 @@ SRC_URI += "file://continue-if-qmgr-init-fails.patch;patch=1"
 SRC_URI += "file://netdev_max_backlog.patch;patch=1"
 SRC_URI += "file://debug.patch;patch=1"
 SRC_URI += "file://Makefile.patch;patch=1"
+SRC_URI += "file://params.patch;patch=1"
 SRC_URI += "file://modprobe.conf"
 
 S = "${WORKDIR}"
diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch b/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch
new file mode 100644
index 0000000000..0b4e4ba026
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch
@@ -0,0 +1,19 @@
+*** ixp400_xscale_sw/src/oslinux/IxLinuxInit.c.orig	Sun Sep 25 05:59:03 2005
+--- ixp400_xscale_sw/src/oslinux/IxLinuxInit.c	Fri Jun  9 14:07:06 2006
+***************
+*** 91,97 ****
+  
+  
+  /* Module parameters */
+! static int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/
+  
+  MODULE_PARM(livelock_dispatcher, "i");
+  MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher");
+--- 91,97 ----
+  
+  
+  /* Module parameters */
+! int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/
+  
+  MODULE_PARM(livelock_dispatcher, "i");
+  MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher");
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index 53cd2ba8fb..567728b40f 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -35,10 +35,11 @@ SRC_URI += "file://mii-debug.patch;patch=1"
 SRC_URI += "file://rtl8201-support.patch;patch=1"
 SRC_URI += "file://gcc4.patch;patch=1"
 SRC_URI += "file://oe-makefile.patch;patch=1"
+SRC_URI += "file://livelock.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r9"
+PR = "r10"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"