* [SLHC 1/4] Cleanup SLHC configuration
@ 2006-07-13 11:06 Ralf Baechle
2006-07-14 5:07 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Ralf Baechle @ 2006-07-13 11:06 UTC (permalink / raw)
To: David S. Miller, netdev, kkeil, Jeff Garzik
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.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
drivers/isdn/i4l/Kconfig | 1 +
drivers/net/Kconfig | 8 ++++++++
drivers/net/Makefile | 10 ++--------
3 files changed, 11 insertions(+), 8 deletions(-)
Index: linux-net/drivers/isdn/i4l/Kconfig
===================================================================
--- linux-net.orig/drivers/isdn/i4l/Kconfig 2006-07-09 02:47:58.000000000 +0100
+++ linux-net/drivers/isdn/i4l/Kconfig 2006-07-10 01:35:45.000000000 +0100
@@ -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
Index: linux-net/drivers/net/Kconfig
===================================================================
--- linux-net.orig/drivers/net/Kconfig 2006-07-09 02:47:58.000000000 +0100
+++ linux-net/drivers/net/Kconfig 2006-07-10 01:35:45.000000000 +0100
@@ -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
Index: linux-net/drivers/net/Makefile
===================================================================
--- linux-net.orig/drivers/net/Makefile 2006-07-09 02:47:58.000000000 +0100
+++ linux-net/drivers/net/Makefile 2006-07-10 01:35:45.000000000 +0100
@@ -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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [SLHC 1/4] Cleanup SLHC configuration
2006-07-13 11:06 [SLHC 1/4] Cleanup SLHC configuration Ralf Baechle
@ 2006-07-14 5:07 ` David Miller
2006-07-14 11:11 ` Ralf Baechle
2006-07-14 11:15 ` Ralf Baechle
0 siblings, 2 replies; 5+ messages in thread
From: David Miller @ 2006-07-14 5:07 UTC (permalink / raw)
To: ralf; +Cc: netdev, kkeil, jeff
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 13 Jul 2006 12:06:15 +0100
> 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.
>
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
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.
^ permalink raw reply [flat|nested] 5+ messages in thread* [SLHC 1/4] Cleanup SLHC configuration
2006-07-14 5:07 ` David Miller
@ 2006-07-14 11:11 ` Ralf Baechle
2006-07-14 11:15 ` Ralf Baechle
1 sibling, 0 replies; 5+ messages in thread
From: Ralf Baechle @ 2006-07-14 11:11 UTC (permalink / raw)
To: David Miller; +Cc: netdev, kkeil, jeff
On Thu, Jul 13, 2006 at 10:07:18PM -0700, David Miller wrote:
> Subject: Re: [SLHC 1/4] Cleanup SLHC configuration
> From: David Miller <davem@davemloft.net>
> Content-Type: Text/Plain; charset=us-ascii
>
> From: Ralf Baechle <ralf@linux-mips.org>
> Date: Thu, 13 Jul 2006 12:06:15 +0100
>
> > 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.
> >
> > Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [SLHC 1/4] Cleanup SLHC configuration
2006-07-14 5:07 ` David Miller
2006-07-14 11:11 ` Ralf Baechle
@ 2006-07-14 11:15 ` Ralf Baechle
2006-07-19 17:50 ` Jeff Garzik
1 sibling, 1 reply; 5+ messages in thread
From: Ralf Baechle @ 2006-07-14 11:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, kkeil, jeff
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.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
drivers/isdn/i4l/Kconfig | 1 +
drivers/net/Kconfig | 8 ++++++++
drivers/net/Makefile | 10 ++--------
3 files changed, 11 insertions(+), 8 deletions(-)
Index: linux-net/drivers/isdn/i4l/Kconfig
===================================================================
--- linux-net.orig/drivers/isdn/i4l/Kconfig 2006-07-09 02:47:58.000000000 +0100
+++ linux-net/drivers/isdn/i4l/Kconfig 2006-07-10 01:35:45.000000000 +0100
@@ -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
Index: linux-net/drivers/net/Kconfig
===================================================================
--- linux-net.orig/drivers/net/Kconfig 2006-07-09 02:47:58.000000000 +0100
+++ linux-net/drivers/net/Kconfig 2006-07-10 01:35:45.000000000 +0100
@@ -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
Index: linux-net/drivers/net/Makefile
===================================================================
--- linux-net.orig/drivers/net/Makefile 2006-07-09 02:47:58.000000000 +0100
+++ linux-net/drivers/net/Makefile 2006-07-10 01:35:45.000000000 +0100
@@ -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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-07-19 17:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-13 11:06 [SLHC 1/4] Cleanup SLHC configuration Ralf Baechle
2006-07-14 5:07 ` David Miller
2006-07-14 11:11 ` Ralf Baechle
2006-07-14 11:15 ` Ralf Baechle
2006-07-19 17:50 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).