ixp4xx, ixp425-eth: Updated for 2.6.17 kernel (MODULE_PARM now removed)

4 files changed, 85 insertions, 2 deletions

diff --git a/packages/ixp425-eth/ixp400-eth-1.5/module-param.patch b/packages/ixp425-eth/ixp400-eth-1.5/module-param.patch
new file mode 100644
index 0000000000..c54c45d716
--- /dev/null
+++ b/packages/ixp425-eth/ixp400-eth-1.5/module-param.patch
@@ -0,0 +1,62 @@
+ ixp400_eth.c |   32 ++++++++++++++++++++++++++++++++
+ 1 files changed, 32 insertions(+)
+
+Index: ixp400_eth/ixp400_eth.c
+===================================================================
+--- ixp400_eth.orig/ixp400_eth.c
++++ ixp400_eth/ixp400_eth.c
+@@ -142,22 +142,54 @@
+ 
+ static int datapath_poll = 1;     /* default : rx/tx polling, not interrupt driven*/
+ 
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(ixp400_netdev_max_backlog, "i");
++#else
++module_param(ixp400_netdev_max_backlog, int, 0644);
++#endif
+ MODULE_PARM_DESC(ixp400_netdev_max_backlog, "Should be set to the value of /proc/sys/net/core/netdev_max_backlog (perf affecting)");
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(datapath_poll, "i");
++#else
++module_param(datapath_poll, int, 0644);
++#endif
+ MODULE_PARM_DESC(datapath_poll, "If non-zero, use polling method for datapath instead of interrupts");
+ #endif /* CONFIG_IXP400_NAPI */
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(npe_learning, "i");
++#else
++module_param(npe_learning, int, 0644);
++#endif
+ MODULE_PARM_DESC(npe_learning, "If non-zero, NPE MAC Address Learning & Filtering feature will be enabled");
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(log_level, "i");
++#else
++module_param(log_level, int, 0644);
++#endif
+ MODULE_PARM_DESC(log_level, "Set log level: 0 - None, 1 - Verbose, 2 - Debug");
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(no_ixp400_sw_init, "i");
++#else
++module_param(no_ixp400_sw_init, int, 0644);
++#endif
+ MODULE_PARM_DESC(no_ixp400_sw_init, "If non-zero, do not initialise Intel IXP400 Software Release core components");
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(no_phy_scan, "i");
++#else
++module_param(no_phy_scan, int, 0644);
++#endif
+ MODULE_PARM_DESC(no_phy_scan, "If non-zero, use hard-coded phy addresses");
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(phy_reset, "i");
++#else
++module_param(phy_reset, int, 0644);
++#endif
+ MODULE_PARM_DESC(phy_reset, "If non-zero, reset the phys");
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(dev_max_count, "i");
++#else
++module_param(dev_max_count, int, 0644);
++#endif
+ MODULE_PARM_DESC(dev_max_count, "Number of devices to initialize");
+ 
+ /* boolean values for PHY link speed, duplex, and autonegotiation */
diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb
index 576e08a5e8..2d131aa6e0 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 = "r13"
+PR = "r14"
 
 DEPENDS = "ixp-osal"
 DEPENDS = "ixp4xx-csr"
@@ -23,6 +23,7 @@ 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://module-param.patch;patch=1"
 SRC_URI += "file://modprobe.conf"
 
 S = "${WORKDIR}"
diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch b/packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch
new file mode 100644
index 0000000000..c61fcc00d3
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch
@@ -0,0 +1,19 @@
+ src/oslinux/IxLinuxInit.c |    4 ++++
+ 1 files changed, 4 insertions(+)
+
+Index: ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+===================================================================
+--- ixp400_xscale_sw.orig/src/oslinux/IxLinuxInit.c
++++ ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+@@ -93,7 +93,11 @@
+ /* Module parameters */
+ static int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/
+ 
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(livelock_dispatcher, "i");
++#else
++module_param(livelock_dispatcher, int, 0644);
++#endif
+ MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher");
+ 
+ /* Init and cleanup functions for module */
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index d8fe3b21c7..3bc29b3286 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -36,10 +36,11 @@ 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"
+SRC_URI += "file://module-param.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r11"
+PR = "r12"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"