Cleanup SLHC configuration
Subsystems (2)
PATCH 1/4 Cleanup SLHC configuration
Convert selection of serial line header compression to use CONFIG_SLHC rather than makefile ifeq uglyness. This makes it easier to select the SLHC module from other code.
--- drivers/isdn/i4l/Kconfig | 1 + drivers/net/Kconfig | 8 ++++++++ drivers/net/Makefile | 10 ++-------- 3 files changed, 11 insertions(+), 8 deletions(-)
drivers/isdn/i4l/Kconfig +1 -0
@@ -5,6 +5,7 @@ config ISDN_PPP bool "Support synchronous PPP" depends on INET + select SLHC help Over digital connections such as ISDN, there is no need to synchronize sender and recipient's clocks with start and stop bits
drivers/net/Kconfig +8 -0
@@ -2509,6 +2509,7 @@ config PLIP config PPP tristate "PPP (point-to-point protocol) support" + select SLHC ---help--- PPP (Point to Point Protocol) is a newer and better SLIP. It serves the same purpose: sending Internet traffic over telephone (and other
@@ -2689,6 +2690,7 @@ config SLIP config SLIP_COMPRESSED bool "CSLIP compressed headers" depends on SLIP + select SLHC ---help--- This protocol is faster than SLIP because it uses compression on the TCP/IP headers (not on the data itself), but it has to be supported
@@ -2701,6 +2703,12 @@ config SLIP_COMPRESSED <http://www.tldp.org/docs.html#howto>, explains how to configure CSLIP. This won't enlarge your kernel. +config SLHC + tristate + help + This option enables Van Jacobsen serial line header compression + routines. + config SLIP_SMART bool "Keepalive and linefill" depends on SLIP
drivers/net/Makefile +1 -5
@@ -2,10 +2,6 @@ # Makefile for the Linux network (ethercard) device drivers. # -ifeq ($(CONFIG_ISDN_PPP),y) - obj-$(CONFIG_ISDN) += slhc.o -endif - obj-$(CONFIG_E1000) += e1000/ obj-$(CONFIG_IBM_EMAC) += ibm_emac/ obj-$(CONFIG_IXGB) += ixgb/
@@ -111,7 +107,7 @@ obj-$(CONFIG_NE_H8300) += ne-h8300.o 839 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o -obj-$(CONFIG_PPP) += ppp_generic.o slhc.o +obj-$(CONFIG_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
@@ -120,9 +116,7 @@ obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o obj-$(CONFIG_PPPOE) += pppox.o pppoe.o obj-$(CONFIG_SLIP) += sl
David Miller
maintainerFrom: Ralf Baechle <[email protected]>
Date: Thu, 13 Jul 2006 12:06:15 +0100
Quoted 5 lines
Convert selection of serial line header compression to use
CONFIG_SLHCrather than makefile ifeq uglyness. This makes it easier to select the SLHC module from other code.Signed-off-by Ralf Baechle <[email protected]>
Something is missing here?
I don't see where in the makefiles that you've added the seemingly necessary:
obj-${CONFIG_SLHC} += slhc.o
line? How does it get linked in now?
Thanks.
PATCH 1/4 Cleanup SLHC configuration
Quoted 13 lines · David Miller
Subject: Re: [SLHC 1/4] Cleanup SLHC configuration
From: David Miller <[email protected]>
Content-Type: Text/Plain; charset=us-asciiFrom: Ralf Baechle <[email protected]>
Date: Thu, 13 Jul 2006 12:06:15 +0100Quoted 5 lines
Convert selection of serial line header compression to use
CONFIG_SLHCrather than makefile ifeq uglyness. This makes it easier to select the SLHC module from other code.Signed-off-by Ralf Baechle <[email protected]>
Quoted 8 lines
Something is missing here?
I don't see where in the makefiles that you've added the seemingly necessary:
obj-${CONFIG_SLHC} += slhc.o
line? How does it get linked in now?
This was sent from a corrupt mailfolder - the last segment wasn't even valid, was truncated after three lines. Will repost in separate mail.
Ralf
Convert selection of serial line header compression to use CONFIG_SLHC rather than makefile ifeq uglyness. This makes it easier to select the SLHC module from other code.
--- drivers/isdn/i4l/Kconfig | 1 + drivers/net/Kconfig | 8 ++++++++ drivers/net/Makefile | 10 ++-------- 3 files changed, 11 insertions(+), 8 deletions(-)
drivers/isdn/i4l/Kconfig +1 -0
@@ -5,6 +5,7 @@ config ISDN_PPP bool "Support synchronous PPP" depends on INET + select SLHC help Over digital connections such as ISDN, there is no need to synchronize sender and recipient's clocks with start and stop bits
drivers/net/Kconfig +8 -0
@@ -2509,6 +2509,7 @@ config PLIP config PPP tristate "PPP (point-to-point protocol) support" + select SLHC ---help--- PPP (Point to Point Protocol) is a newer and better SLIP. It serves the same purpose: sending Internet traffic over telephone (and other
@@ -2689,6 +2690,7 @@ config SLIP config SLIP_COMPRESSED bool "CSLIP compressed headers" depends on SLIP + select SLHC ---help--- This protocol is faster than SLIP because it uses compression on the TCP/IP headers (not on the data itself), but it has to be supported
@@ -2701,6 +2703,12 @@ config SLIP_COMPRESSED <http://www.tldp.org/docs.html#howto>, explains how to configure CSLIP. This won't enlarge your kernel. +config SLHC + tristate + help + This option enables Van Jacobsen serial line header compression + routines. + config SLIP_SMART bool "Keepalive and linefill" depends on SLIP
drivers/net/Makefile +2 -8
@@ -2,10 +2,6 @@ # Makefile for the Linux network (ethercard) device drivers. # -ifeq ($(CONFIG_ISDN_PPP),y) - obj-$(CONFIG_ISDN) += slhc.o -endif - obj-$(CONFIG_E1000) += e1000/ obj-$(CONFIG_IBM_EMAC) += ibm_emac/ obj-$(CONFIG_IXGB) += ixgb/
@@ -111,7 +107,7 @@ obj-$(CONFIG_NE_H8300) += ne-h8300.o 839 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o -obj-$(CONFIG_PPP) += ppp_generic.o slhc.o +obj-$(CONFIG_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
@@ -120,9 +116,7 @@ obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o obj-$(CONFIG_PPPOE) += pppox.o pppoe.o obj-$(CONFIG_SLIP) += slip.o -ifeq ($(CONFIG_SLIP_COMPRESSED),y) - obj-$(CONFIG_SLIP) += slhc.o -endif +obj-$(CONFIG_SLHC) += slhc.o obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_IFB) += ifb.o
applied updated patch #1, and patches 2-4