diff options
author | Paul Mackerras <paulus@samba.org> | 2012-03-04 07:56:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-04 20:41:38 -0500 |
commit | bf7daebb9fba540cb8864f435f153678b3e5c171 (patch) | |
tree | dc825997a817db8c1f8b2bf930de10a428aaa796 /Documentation/networking | |
parent | 784db3f06228da81627d23052a6d2ecc38db001a (diff) |
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
This moves the definitions of the ioctls, constants and structures
relating to the ppp_generic interface to userspace out from if_ppp.h
to a new file, ppp-ioctl.h. The new file has my copyright since I
designed and implemented the ppp_generic interface in the late 1990s.
None of the contents of this file comes from the original if_ppp.h
published by Carnegie Mellon University.
Of the remainder of if_ppp.h, only the PPP_MTU definition was being
used, and this replaces the uses of it with PPP_MRU (which is identical).
Therefore, this replaces the entire file with the single line
#include <linux/ppp-ioctl.h>
which clearly doesn't contain any CMU code. Thus I have removed the
CMU copyright notice with its problematic advertising clause, and in
fact since it's only one trivial line I have not added any other
copyright notice.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
-rw-r--r-- | Documentation/networking/ppp_generic.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/ppp_generic.txt b/Documentation/networking/ppp_generic.txt index 15b5172fbb98..091d20273dcb 100644 --- a/Documentation/networking/ppp_generic.txt +++ b/Documentation/networking/ppp_generic.txt | |||
@@ -342,7 +342,7 @@ an interface unit are: | |||
342 | numbers on received multilink fragments | 342 | numbers on received multilink fragments |
343 | SC_MP_XSHORTSEQ transmit short multilink sequence nos. | 343 | SC_MP_XSHORTSEQ transmit short multilink sequence nos. |
344 | 344 | ||
345 | The values of these flags are defined in <linux/if_ppp.h>. Note | 345 | The values of these flags are defined in <linux/ppp-ioctl.h>. Note |
346 | that the values of the SC_MULTILINK, SC_MP_SHORTSEQ and | 346 | that the values of the SC_MULTILINK, SC_MP_SHORTSEQ and |
347 | SC_MP_XSHORTSEQ bits are ignored if the CONFIG_PPP_MULTILINK option | 347 | SC_MP_XSHORTSEQ bits are ignored if the CONFIG_PPP_MULTILINK option |
348 | is not selected. | 348 | is not selected. |
@@ -358,7 +358,7 @@ an interface unit are: | |||
358 | 358 | ||
359 | * PPPIOCSCOMPRESS sets the parameters for packet compression or | 359 | * PPPIOCSCOMPRESS sets the parameters for packet compression or |
360 | decompression. The argument should point to a ppp_option_data | 360 | decompression. The argument should point to a ppp_option_data |
361 | structure (defined in <linux/if_ppp.h>), which contains a | 361 | structure (defined in <linux/ppp-ioctl.h>), which contains a |
362 | pointer/length pair which should describe a block of memory | 362 | pointer/length pair which should describe a block of memory |
363 | containing a CCP option specifying a compression method and its | 363 | containing a CCP option specifying a compression method and its |
364 | parameters. The ppp_option_data struct also contains a `transmit' | 364 | parameters. The ppp_option_data struct also contains a `transmit' |
@@ -395,7 +395,7 @@ an interface unit are: | |||
395 | 395 | ||
396 | * PPPIOCSNPMODE sets the network-protocol mode for a given network | 396 | * PPPIOCSNPMODE sets the network-protocol mode for a given network |
397 | protocol. The argument should point to an npioctl struct (defined | 397 | protocol. The argument should point to an npioctl struct (defined |
398 | in <linux/if_ppp.h>). The `protocol' field gives the PPP protocol | 398 | in <linux/ppp-ioctl.h>). The `protocol' field gives the PPP protocol |
399 | number for the protocol to be affected, and the `mode' field | 399 | number for the protocol to be affected, and the `mode' field |
400 | specifies what to do with packets for that protocol: | 400 | specifies what to do with packets for that protocol: |
401 | 401 | ||