ixp425_eth: commit fixes for 2.6.14 kernels

diff --git a/packages/ixp425-eth/files/2.6.14.patch b/packages/ixp425-eth/files/2.6.14.patch
new file mode 100644 (file)
index 0000000..c86ff97
--- /dev/null
+++ b/packages/ixp425-eth/files/2.6.14.patch
@@ -0,0 +1,16 @@
+# change in field semantic in 2.6.14
+--- dir/ixp425_eth.c   2005-09-24 17:50:57.828607113 -0700
++++ dir/ixp425_eth.c   2005-09-24 17:54:19.593303365 -0700
+@@ -1300,8 +1300,12 @@
+     skb->len -= header_len;
+     
+     /* fill the pkt arrival time (set at the irq callback entry) */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+     skb->stamp.tv_sec = irq_stamp.tv_sec;
+     skb->stamp.tv_usec = irq_stamp.tv_usec;
++#else
++    skb_set_timestamp(skb, &irq_stamp);
++#endif
+     
+     /* fill the input device field */
+     skb->dev = dev;

diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index dec772b..cbf7e10 100644 (file)
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -9,7 +9,8 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa
           file://pollcontroller.patch;patch=1 \
           file://mm4.patch;patch=1"
 SRC_URI += "file://2.6.13.patch;patch=1"
-PR = "r9"
+SRC_URI += "file://2.6.14.patch;patch=1"
+PR = "r10"
 
 S = "${WORKDIR}"
 
@@ -23,22 +24,6 @@ inherit module
 KERNEL_CC += "${TARGET_CC_KERNEL_ARCH}"
 KERNEL_LD += "${TARGET_LD_KERNEL_ARCH}"
 
-#do_ixp425_c_patch_fetch () {
-#      if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
-#              cd ${DL_DIR}
-#              wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193
-#              md5sum > ixp425_eth.c.patch.md5
-#      fi
-#}
-#
-#addtask ixp425_c_patch_fetch after do_fetch before do_unpack
-
-#do_ixp425_c_patch_unpack () {
-#      install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
-#}
-
-#addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
-
 do_pre_patch () {
        patcher -p 0 -i ixp425_eth_1_1_update_nf_bridge.patch
        patcher -f -p 0 -i ixp425_eth.c.patch
@@ -51,7 +36,7 @@ do_compile () {
        oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
                   'CC=${KERNEL_CC}' \
                   'LD=${KERNEL_LD}' \
-                  'EXTRA_CFLAGS=-I${STAGING_INCDIR}/linux/ixp4xx-csr -I${STAGING_KERNEL_DIR}/include'
+                  'EXTRA_CFLAGS=-I${STAGING_INCDIR}/linux/ixp4xx-csr -I${STAGING_KERNEL_DIR}/include -DCPU=33 -DXSCALE=33'
 }
 
 do_install () {