update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly
SVN-Revision: 10137
This commit is contained in:
@@ -4,10 +4,11 @@ Microsoft Point-to-Point Encryption / Compression support
|
||||
|
||||
http://www.polbox.com/h/hs001/linux-2.4.29-mppe-mppc-1.3.patch.gz
|
||||
|
||||
diff -ruN linux-2.4.29.orig/Documentation/Configure.help linux-2.4.29/Documentation/Configure.help
|
||||
--- linux-2.4.29.orig/Documentation/Configure.help 2005-02-02 22:18:18.000000000 +0100
|
||||
+++ linux-2.4.29/Documentation/Configure.help 2005-02-02 22:26:37.000000000 +0100
|
||||
@@ -9969,6 +9969,28 @@
|
||||
Index: linux-2.4.35.4/Documentation/Configure.help
|
||||
===================================================================
|
||||
--- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:49.287229757 +0100
|
||||
+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:51.927380210 +0100
|
||||
@@ -9974,6 +9974,28 @@
|
||||
module; it is called bsd_comp.o and will show up in the directory
|
||||
modules once you have said "make modules". If unsure, say N.
|
||||
|
||||
@@ -36,9 +37,10 @@ diff -ruN linux-2.4.29.orig/Documentation/Configure.help linux-2.4.29/Documentat
|
||||
PPP over Ethernet
|
||||
CONFIG_PPPOE
|
||||
Support for PPP over Ethernet.
|
||||
diff -ruN linux-2.4.29.orig/crypto/Config.in linux-2.4.29/crypto/Config.in
|
||||
--- linux-2.4.29.orig/crypto/Config.in 2005-02-02 22:18:14.000000000 +0100
|
||||
+++ linux-2.4.29/crypto/Config.in 2005-02-02 22:26:37.000000000 +0100
|
||||
Index: linux-2.4.35.4/crypto/Config.in
|
||||
===================================================================
|
||||
--- linux-2.4.35.4.orig/crypto/Config.in 2007-12-15 05:19:42.094819886 +0100
|
||||
+++ linux-2.4.35.4/crypto/Config.in 2007-12-15 05:19:51.927380210 +0100
|
||||
@@ -11,7 +11,9 @@
|
||||
"$CONFIG_INET6_AH" = "y" -o \
|
||||
"$CONFIG_INET6_AH" = "m" -o \
|
||||
@@ -100,10 +102,11 @@ diff -ruN linux-2.4.29.orig/crypto/Config.in linux-2.4.29/crypto/Config.in
|
||||
if [ "$CONFIG_INET_IPCOMP" = "y" -o \
|
||||
"$CONFIG_INET_IPCOMP" = "m" -o \
|
||||
"$CONFIG_INET6_IPCOMP" = "y" -o \
|
||||
diff -ruN linux-2.4.29.orig/drivers/net/Config.in linux-2.4.29/drivers/net/Config.in
|
||||
--- linux-2.4.29.orig/drivers/net/Config.in 2005-02-02 22:17:31.000000000 +0100
|
||||
+++ linux-2.4.29/drivers/net/Config.in 2005-02-02 22:26:37.000000000 +0100
|
||||
@@ -332,6 +332,7 @@
|
||||
Index: linux-2.4.35.4/drivers/net/Config.in
|
||||
===================================================================
|
||||
--- linux-2.4.35.4.orig/drivers/net/Config.in 2007-12-15 05:19:42.102820341 +0100
|
||||
+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:19:51.931380439 +0100
|
||||
@@ -336,6 +336,7 @@
|
||||
dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP
|
||||
dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
|
||||
dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP
|
||||
@@ -111,10 +114,11 @@ diff -ruN linux-2.4.29.orig/drivers/net/Config.in linux-2.4.29/drivers/net/Confi
|
||||
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
|
||||
dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
|
||||
fi
|
||||
diff -ruN linux-2.4.29.orig/drivers/net/Makefile linux-2.4.29/drivers/net/Makefile
|
||||
--- linux-2.4.29.orig/drivers/net/Makefile 2005-02-02 22:17:23.000000000 +0100
|
||||
+++ linux-2.4.29/drivers/net/Makefile 2005-02-02 22:26:37.000000000 +0100
|
||||
@@ -163,6 +163,7 @@
|
||||
Index: linux-2.4.35.4/drivers/net/Makefile
|
||||
===================================================================
|
||||
--- linux-2.4.35.4.orig/drivers/net/Makefile 2007-12-15 05:19:42.110820796 +0100
|
||||
+++ linux-2.4.35.4/drivers/net/Makefile 2007-12-15 05:19:51.931380439 +0100
|
||||
@@ -166,6 +166,7 @@
|
||||
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
|
||||
obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
|
||||
obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
|
||||
@@ -122,9 +126,10 @@ diff -ruN linux-2.4.29.orig/drivers/net/Makefile linux-2.4.29/drivers/net/Makefi
|
||||
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
|
||||
|
||||
obj-$(CONFIG_SLIP) += slip.o
|
||||
diff -ruN linux-2.4.29.orig/drivers/net/ppp_generic.c linux-2.4.29/drivers/net/ppp_generic.c
|
||||
--- linux-2.4.29.orig/drivers/net/ppp_generic.c 2005-02-02 22:17:24.000000000 +0100
|
||||
+++ linux-2.4.29/drivers/net/ppp_generic.c 2005-02-02 22:26:37.000000000 +0100
|
||||
Index: linux-2.4.35.4/drivers/net/ppp_generic.c
|
||||
===================================================================
|
||||
--- linux-2.4.35.4.orig/drivers/net/ppp_generic.c 2007-12-15 05:19:42.114821025 +0100
|
||||
+++ linux-2.4.35.4/drivers/net/ppp_generic.c 2007-12-15 05:19:51.931380439 +0100
|
||||
@@ -19,7 +19,7 @@
|
||||
* PPP driver, written by Michael Callahan and Al Longyear, and
|
||||
* subsequently hacked by Paul Mackerras.
|
||||
@@ -258,9 +263,10 @@ diff -ruN linux-2.4.29.orig/drivers/net/ppp_generic.c linux-2.4.29/drivers/net/p
|
||||
init_ppp_file(&ppp->file, INTERFACE);
|
||||
ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */
|
||||
for (i = 0; i < NUM_NP; ++i)
|
||||
diff -ruN linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c linux-2.4.29/drivers/net/ppp_mppe_mppc.c
|
||||
--- linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-2.4.29/drivers/net/ppp_mppe_mppc.c 2005-02-02 23:07:40.000000000 +0100
|
||||
Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c 2007-12-15 05:19:51.935380668 +0100
|
||||
@@ -0,0 +1,1312 @@
|
||||
+/*
|
||||
+ * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module.
|
||||
@@ -1574,9 +1580,10 @@ diff -ruN linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c linux-2.4.29/drivers/net
|
||||
+MODULE_AUTHOR("Jan Dubiec <jdx@slackware.pl>");
|
||||
+MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux");
|
||||
+MODULE_LICENSE("Dual BSD/GPL");
|
||||
diff -ruN linux-2.4.29.orig/include/linux/ppp-comp.h linux-2.4.29/include/linux/ppp-comp.h
|
||||
--- linux-2.4.29.orig/include/linux/ppp-comp.h 2005-02-02 22:18:25.000000000 +0100
|
||||
+++ linux-2.4.29/include/linux/ppp-comp.h 2005-02-02 22:41:01.000000000 +0100
|
||||
Index: linux-2.4.35.4/include/linux/ppp-comp.h
|
||||
===================================================================
|
||||
--- linux-2.4.35.4.orig/include/linux/ppp-comp.h 2007-12-15 05:19:42.134822165 +0100
|
||||
+++ linux-2.4.35.4/include/linux/ppp-comp.h 2007-12-15 05:19:51.935380668 +0100
|
||||
@@ -28,7 +28,7 @@
|
||||
*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user