dect
/
linux-2.6
Archived
13
0
Fork 0

ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>

Since all that include/linux/if_ppp.h does is #include <linux/ppp-ioctl.h>,
this replaces the occurrences of #include <linux/if_ppp.h> with
#include <linux/ppp-ioctl.h>.

It also corrects an error in Documentation/networking/l2tp.txt, where
it referenced include/linux/if_ppp.h as the source of some definitions
that are actually now defined in include/linux/if_pppol2tp.h.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paul Mackerras 2012-03-04 12:56:55 +00:00 committed by David S. Miller
parent bf7daebb9f
commit 4b32da2bcf
13 changed files with 13 additions and 13 deletions

View File

@ -111,7 +111,7 @@ When creating PPPoL2TP sockets, the application provides information
to the driver about the socket in a socket connect() call. Source and to the driver about the socket in a socket connect() call. Source and
destination tunnel and session ids are provided, as well as the file destination tunnel and session ids are provided, as well as the file
descriptor of a UDP socket. See struct pppol2tp_addr in descriptor of a UDP socket. See struct pppol2tp_addr in
include/linux/if_ppp.h. Note that zero tunnel / session ids are include/linux/if_pppol2tp.h. Note that zero tunnel / session ids are
treated specially. When creating the per-tunnel PPPoL2TP management treated specially. When creating the per-tunnel PPPoL2TP management
socket in Step 2 above, zero source and destination session ids are socket in Step 2 above, zero source and destination session ids are
specified, which tells the driver to prepare the supplied UDP file specified, which tells the driver to prepare the supplied UDP file

View File

@ -25,7 +25,7 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>

View File

@ -26,7 +26,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/crc-ccitt.h> #include <linux/crc-ccitt.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/init.h> #include <linux/init.h>

View File

@ -39,7 +39,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/completion.h> #include <linux/completion.h>

View File

@ -72,7 +72,7 @@
#include <linux/if_pppox.h> #include <linux/if_pppox.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>

View File

@ -28,7 +28,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/if_pppox.h> #include <linux/if_pppox.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/kmod.h> #include <linux/kmod.h>

View File

@ -22,7 +22,7 @@
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include "network.h" #include "network.h"

View File

@ -21,7 +21,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if.h> #include <linux/if.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/slab.h> #include <linux/slab.h>

View File

@ -34,7 +34,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/if_pppox.h> #include <linux/if_pppox.h>
#include <linux/mtio.h> #include <linux/mtio.h>
#include <linux/auto_fs.h> #include <linux/auto_fs.h>

View File

@ -187,7 +187,7 @@ typedef struct {
#endif #endif
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/isdn_ppp.h> #include <linux/isdn_ppp.h>
#endif #endif

View File

@ -44,7 +44,7 @@
#include <linux/atmdev.h> #include <linux/atmdev.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/atmppp.h> #include <linux/atmppp.h>

View File

@ -254,7 +254,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <net/irda/irda.h> #include <net/irda/irda.h>

View File

@ -82,7 +82,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <linux/if_ppp.h> #include <linux/ppp-ioctl.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/hash.h> #include <linux/hash.h>
#include <linux/sort.h> #include <linux/sort.h>