Commit bf7daebb authored by Paul Mackerras's avatar Paul Mackerras Committed by David S. Miller
Browse files

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: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 784db3f0

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ Code Seq#(hex) Include File Comments 
		linux/ixjuser.h		<http://web.archive.org/web/*/http://www.quicknet.net>

'r'	00-1F	linux/msdos_fs.h and fs/fat/dir.c

's'	all	linux/cdk.h

't'	00-7F	linux/if_ppp.h

't'	00-7F	linux/ppp-ioctl.h

't'	80-8F	linux/isdn_ppp.h

't'	90	linux/toshiba.h

'u'	00-1F	linux/smb_fs.h		gone

Documentation/networking/ppp_generic.txt

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ an interface unit are: 
				numbers on received multilink fragments

	SC_MP_XSHORTSEQ		transmit short multilink sequence nos.



  The values of these flags are defined in <linux/if_ppp.h>.  Note

  The values of these flags are defined in <linux/ppp-ioctl.h>.  Note

  that the values of the SC_MULTILINK, SC_MP_SHORTSEQ and

  SC_MP_XSHORTSEQ bits are ignored if the CONFIG_PPP_MULTILINK option

  is not selected.
@@ -358,7 +358,7 @@ an interface unit are: 


* PPPIOCSCOMPRESS sets the parameters for packet compression or

  decompression.  The argument should point to a ppp_option_data

  structure (defined in <linux/if_ppp.h>), which contains a

  structure (defined in <linux/ppp-ioctl.h>), which contains a

  pointer/length pair which should describe a block of memory

  containing a CCP option specifying a compression method and its

  parameters.  The ppp_option_data struct also contains a `transmit'
@@ -395,7 +395,7 @@ an interface unit are: 


* PPPIOCSNPMODE sets the network-protocol mode for a given network

  protocol.  The argument should point to an npioctl struct (defined

  in <linux/if_ppp.h>).  The `protocol' field gives the PPP protocol

  in <linux/ppp-ioctl.h>).  The `protocol' field gives the PPP protocol

  number for the protocol to be affected, and the `mode' field

  specifies what to do with packets for that protocol:

drivers/net/ppp/ppp_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/poll.h>

#include <linux/ppp_defs.h>

#include <linux/filter.h>

#include <linux/if_ppp.h>

#include <linux/ppp-ioctl.h>

#include <linux/ppp_channel.h>

#include <linux/ppp-comp.h>

#include <linux/skbuff.h>
@@ -1031,7 +1031,7 @@ static void ppp_setup(struct net_device *dev) 
{

	dev->netdev_ops = &ppp_netdev_ops;

	dev->hard_header_len = PPP_HDRLEN;

	dev->mtu = PPP_MTU;

	dev->mtu = PPP_MRU;

	dev->addr_len = 0;

	dev->tx_queue_len = 3;

	dev->type = ARPHRD_PPP;

drivers/net/ppp/pptp.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/ppp_channel.h>

#include <linux/ppp_defs.h>

#include <linux/if_pppox.h>

#include <linux/if_ppp.h>

#include <linux/ppp-ioctl.h>

#include <linux/notifier.h>

#include <linux/file.h>

#include <linux/in.h>
@@ -481,7 +481,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, 


	po->chan.mtu = dst_mtu(&rt->dst);

	if (!po->chan.mtu)

		po->chan.mtu = PPP_MTU;

		po->chan.mtu = PPP_MRU;

	ip_rt_put(rt);

	po->chan.mtu -= PPTP_HEADER_OVERHEAD;

include/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ header-y += poll.h 
header-y += posix_types.h

header-y += ppdev.h

header-y += ppp-comp.h

header-y += ppp-ioctl.h

header-y += ppp_defs.h

header-y += pps.h

header-y += prctl.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE