diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-03 06:17:13 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-27 03:58:36 -0400 |
commit | b5451d783ade99308dfccdf5ca284ed07affa4ff (patch) | |
tree | 98830cee17e38f3351bb3f1cc839ee3c29ec68a3 /drivers/net/Kconfig | |
parent | 18e635f4b3e1e1b43cb239321f6120918ba38d46 (diff) |
slip: Move the SLIP drivers
Move the Serial Line Internet Protocol (SLIP) drivers into
drivers/net/slip/ and make the necessary Kconfig and Makefile
changes.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 74 |
1 files changed, 2 insertions, 72 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3f72686e1804..b3206c9222e6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -199,6 +199,8 @@ source "drivers/net/fddi/Kconfig" | |||
199 | 199 | ||
200 | source "drivers/net/plip/Kconfig" | 200 | source "drivers/net/plip/Kconfig" |
201 | 201 | ||
202 | source "drivers/net/slip/Kconfig" | ||
203 | |||
202 | source "drivers/net/tokenring/Kconfig" | 204 | source "drivers/net/tokenring/Kconfig" |
203 | 205 | ||
204 | source "drivers/net/wireless/Kconfig" | 206 | source "drivers/net/wireless/Kconfig" |
@@ -274,78 +276,6 @@ config RIONET_RX_SIZE | |||
274 | depends on RIONET | 276 | depends on RIONET |
275 | default "128" | 277 | default "128" |
276 | 278 | ||
277 | config SLIP | ||
278 | tristate "SLIP (serial line) support" | ||
279 | ---help--- | ||
280 | Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to | ||
281 | connect to your Internet service provider or to connect to some | ||
282 | other local Unix box or if you want to configure your Linux box as a | ||
283 | Slip/CSlip server for other people to dial in. SLIP (Serial Line | ||
284 | Internet Protocol) is a protocol used to send Internet traffic over | ||
285 | serial connections such as telephone lines or null modem cables; | ||
286 | nowadays, the protocol PPP is more commonly used for this same | ||
287 | purpose. | ||
288 | |||
289 | Normally, your access provider has to support SLIP in order for you | ||
290 | to be able to use it, but there is now a SLIP emulator called SLiRP | ||
291 | around (available from | ||
292 | <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which | ||
293 | allows you to use SLIP over a regular dial up shell connection. If | ||
294 | you plan to use SLiRP, make sure to say Y to CSLIP, below. The | ||
295 | NET-3-HOWTO, available from | ||
296 | <http://www.tldp.org/docs.html#howto>, explains how to | ||
297 | configure SLIP. Note that you don't need this option if you just | ||
298 | want to run term (term is a program which gives you almost full | ||
299 | Internet connectivity if you have a regular dial up shell account on | ||
300 | some Internet connected Unix computer. Read | ||
301 | <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>). SLIP | ||
302 | support will enlarge your kernel by about 4 KB. If unsure, say N. | ||
303 | |||
304 | To compile this driver as a module, choose M here. The module | ||
305 | will be called slip. | ||
306 | |||
307 | config SLIP_COMPRESSED | ||
308 | bool "CSLIP compressed headers" | ||
309 | depends on SLIP | ||
310 | select SLHC | ||
311 | ---help--- | ||
312 | This protocol is faster than SLIP because it uses compression on the | ||
313 | TCP/IP headers (not on the data itself), but it has to be supported | ||
314 | on both ends. Ask your access provider if you are not sure and | ||
315 | answer Y, just in case. You will still be able to use plain SLIP. If | ||
316 | you plan to use SLiRP, the SLIP emulator (available from | ||
317 | <ftp://ibiblio.org/pub/Linux/system/network/serial/>) which | ||
318 | allows you to use SLIP over a regular dial up shell connection, you | ||
319 | definitely want to say Y here. The NET-3-HOWTO, available from | ||
320 | <http://www.tldp.org/docs.html#howto>, explains how to configure | ||
321 | CSLIP. This won't enlarge your kernel. | ||
322 | |||
323 | config SLHC | ||
324 | tristate | ||
325 | help | ||
326 | This option enables Van Jacobsen serial line header compression | ||
327 | routines. | ||
328 | |||
329 | config SLIP_SMART | ||
330 | bool "Keepalive and linefill" | ||
331 | depends on SLIP | ||
332 | help | ||
333 | Adds additional capabilities to the SLIP driver to support the | ||
334 | RELCOM line fill and keepalive monitoring. Ideal on poor quality | ||
335 | analogue lines. | ||
336 | |||
337 | config SLIP_MODE_SLIP6 | ||
338 | bool "Six bit SLIP encapsulation" | ||
339 | depends on SLIP | ||
340 | help | ||
341 | Just occasionally you may need to run IP over hostile serial | ||
342 | networks that don't pass all control characters or are only seven | ||
343 | bit. Saying Y here adds an extra mode you can use with SLIP: | ||
344 | "slip6". In this mode, SLIP will only send normal ASCII symbols over | ||
345 | the serial device. Naturally, this has to be supported at the other | ||
346 | end of the link as well. It's good enough, for example, to run IP | ||
347 | over the async ports of a Camtec JNT Pad. If unsure, say N. | ||
348 | |||
349 | config NET_FC | 279 | config NET_FC |
350 | bool "Fibre Channel driver support" | 280 | bool "Fibre Channel driver support" |
351 | depends on SCSI && PCI | 281 | depends on SCSI && PCI |