diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-22 02:26:32 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-22 02:26:32 +0000 |
| commit | 243e190675b029d0d7de10abb9bd6af71e7e3f3f (patch) | |
| tree | bca1555f429756ea48adc5920b1143dc9149e1d4 | |
| parent | c795766793a437e7a9d5fb620b420c5bf9ca3712 (diff) | |
| download | upstream-243e190675b029d0d7de10abb9bd6af71e7e3f3f.tar.gz upstream-243e190675b029d0d7de10abb9bd6af71e7e3f3f.tar.bz2 upstream-243e190675b029d0d7de10abb9bd6af71e7e3f3f.zip | |
ppp: enable multilink support (#4837)
SVN-Revision: 19811
| -rw-r--r-- | package/ppp/patches/200-makefile.patch | 7 | ||||
| -rw-r--r-- | target/linux/at91/config-2.6.25 | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.4/config-default | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/package/ppp/patches/200-makefile.patch b/package/ppp/patches/200-makefile.patch index e9731d1e0d..af826749c3 100644 --- a/package/ppp/patches/200-makefile.patch +++ b/package/ppp/patches/200-makefile.patch @@ -1,6 +1,6 @@ --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -48,21 +48,21 @@ MPPE=y +@@ -48,7 +48,7 @@ MPPE=y # Uncomment the next line to include support for PPP packet filtering. # This requires that the libpcap library and headers be installed # and that the kernel driver support PPP packet filtering. @@ -9,10 +9,7 @@ # Uncomment the next line to enable multilink PPP (enabled by default) # Linux distributions: Please leave multilink ENABLED in your builds - # of pppd! --HAVE_MULTILINK=y -+#HAVE_MULTILINK=y - +@@ -58,11 +58,11 @@ HAVE_MULTILINK=y # Uncomment the next line to enable the TDB database (enabled by default.) # If you enable multilink, then TDB is automatically enabled also. # Linux distributions: Please leave TDB ENABLED in your builds. diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25 index 196f2d1045..572d596118 100644 --- a/target/linux/at91/config-2.6.25 +++ b/target/linux/at91/config-2.6.25 @@ -133,10 +133,6 @@ CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_PCI is not set # CONFIG_PCI_SYSCALL is not set CONFIG_PHYLIB=y -# CONFIG_PPP_MULTILINK is not set -# CONFIG_PPPOATM is not set -# CONFIG_PPPOL2TP is not set -# CONFIG_PPP_SYNC_TTY is not set # CONFIG_SCSI_WAIT_SCAN is not set # CONFIG_SDIO_UART is not set # CONFIG_SERIAL_8250 is not set diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default index 5dce4279cd..8490f36b39 100644 --- a/target/linux/generic-2.4/config-default +++ b/target/linux/generic-2.4/config-default @@ -595,7 +595,7 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_FILTER=y CONFIG_PPP=m CONFIG_PPP_MPPE_MPPC=m -# CONFIG_PPP_MULTILINK is not set +CONFIG_PPP_MULTILINK=y CONFIG_PPPOE=m CONFIG_PPP_SYNC_TTY=m # CONFIG_PRISM54 is not set |