summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2006-04-18 04:07:11 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-18 04:07:11 +0000
commit97b208bcfb1424789fe7dd997f27af3260a98b2c (patch)
tree65dc8759433e218b5552d10a120be2ace231e47c
parent5a8ed083b17f8f337e6e550b4b065a935e154986 (diff)
parentb0ae9c94ed03dbd39744b67750fbea4c750f66bb (diff)
merge of b9ca9fd7f2a8108ba2e4ccd8ad4e71464cfa782e
and ee282fd56ede355c1afbe06deea556672508236c
-rw-r--r--packages/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch13
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r63.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/packages/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch b/packages/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch
new file mode 100644
index 0000000000..b068a5a8c6
--- /dev/null
+++ b/packages/linux/unslung-kernel/ppp_mppe_no_fp_in_kernel.patch
@@ -0,0 +1,13 @@
+--- linux-2.4.22/drivers/net/ppp_mppe.c~ 2006-04-15 12:23:04.000000000 -0500
++++ linux-2.4.22/drivers/net/ppp_mppe.c 2006-04-17 20:24:39.000000000 -0500
+@@ -507,7 +507,10 @@
+ (state->stats).bytes_out = (state->stats).comp_bytes;
+
+ /* this _SHOULD_ always be 1 */
++#if 0
++ /* the kernel may not do floating point calculations, so don't do this. */
+ (state->stats).ratio = (state->stats).in_count/(state->stats).bytes_out;
++#endif
+
+ *stats = state->stats;
+
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 60b83bade2..8aa07e8978 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb
DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r11"
+PR = "r12"
KERNEL_SUFFIX = "unslung"
@@ -23,6 +23,7 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
file://nfs-blocksize.patch;patch=1 \
file://pl2303.patch;patch=1 \
file://netconsole.patch;patch=1 \
+ file://ppp_mppe_no_fp_in_kernel.patch;patch=1 \
${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"