ixp4xx-csr: Added patch to remove MODUE_USE_COUNT stuff

diff --git a/packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch b/packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch
new file mode 100644 (file)
index 0000000..0fc2c52
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch
@@ -0,0 +1,24 @@
+ src/oslinux/IxLinuxInit.c |    3 ---
+ 1 files changed, 3 deletions(-)
+
+Index: ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+===================================================================
+--- ixp400_xscale_sw.orig/src/oslinux/IxLinuxInit.c
++++ ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+@@ -164,7 +164,6 @@
+       return -EEXIST;
+     }
+ 
+-    MOD_INC_USE_COUNT;   /* Increment use count to prevent premature rmmod-ing */
+     ixNpeDlSegmentedListHead = NULL;  /* Reset linked list which keeps track of Microcode fragments */
+     ixNpeDlSegmentedListTail = NULL;
+     ixNpeDlTotalBytesReadIn = 0;
+@@ -229,8 +228,6 @@
+       kfree (temp);
+     }
+ 
+-    MOD_DEC_USE_COUNT;
+-
+     return 0;
+ }
+ 

diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
index c97a54b..0a6cbaa 100644 (file)
--- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
@@ -41,10 +41,11 @@ 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"
+SRC_URI += "file://module-use-count.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 
@@ -81,7 +82,7 @@ EXTRA_OEMAKE = "'AR=${AR}' \
                '${IX_TARGET}_COMPONENTS=${COMPONENTS}' \
                '${IX_TARGET}_CODELETS_COMPONENTS=${CODELETS_COMPONENTS}' \
                'IX_DEVICE=ixp42X' \
-               'IX_INCLUDE_MICROCODE=1' \
+               'IX_BUILD_MICROCODE=1' \
                'IX_UTOPIAMODE=0' \
                'IX_MPHYSINGLEPORT=1' \
                ${IX_ENSURE} \
@@ -122,4 +123,5 @@ PACKAGES = "${PN}"
 do_install () {
        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/ixp400
        install -m 0644 lib/${IX_TARGET}/ixp400.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/ixp400/
+       install -m 0644 lib/${IX_TARGET}/IxNpeMicrocode.dat ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/ixp400/
 }