Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/networking/l2tp.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

destination tunnel and session ids are provided, as well as the file

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

socket in Step 2 above, zero source and destination session ids are

specified, which tells the driver to prepare the supplied UDP file

drivers/isdn/capi/capi.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/tty.h>

#include <linux/netdevice.h>

#include <linux/ppp_defs.h>

#include <linux/if_ppp.h>

#include <linux/ppp-ioctl.h>

#include <linux/skbuff.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

drivers/net/ppp/ppp_async.c

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

#include <linux/crc-ccitt.h>

#include <linux/ppp_defs.h>

#include <linux/if_ppp.h>

#include <linux/ppp-ioctl.h>

#include <linux/ppp_channel.h>

#include <linux/spinlock.h>

#include <linux/init.h>

drivers/net/ppp/ppp_synctty.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <linux/netdevice.h>

#include <linux/poll.h>

#include <linux/ppp_defs.h>

#include <linux/if_ppp.h>

#include <linux/ppp-ioctl.h>

#include <linux/ppp_channel.h>

#include <linux/spinlock.h>

#include <linux/completion.h>

drivers/net/ppp/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#include <linux/if_pppox.h>

#include <linux/ppp_channel.h>

#include <linux/ppp_defs.h>

#include <linux/if_ppp.h>

#include <linux/ppp-ioctl.h>

#include <linux/notifier.h>

#include <linux/file.h>

#include <linux/proc_fs.h>