Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Paul Mackerras and committed by
David S. Miller
4b32da2b bf7daebb

+13 -13
+1 -1
Documentation/networking/l2tp.txt
··· 111 111 to the driver about the socket in a socket connect() call. Source and 112 112 destination tunnel and session ids are provided, as well as the file 113 113 descriptor of a UDP socket. See struct pppol2tp_addr in 114 - include/linux/if_ppp.h. Note that zero tunnel / session ids are 114 + include/linux/if_pppol2tp.h. Note that zero tunnel / session ids are 115 115 treated specially. When creating the per-tunnel PPPoL2TP management 116 116 socket in Step 2 above, zero source and destination session ids are 117 117 specified, which tells the driver to prepare the supplied UDP file
+1 -1
drivers/isdn/capi/capi.c
··· 25 25 #include <linux/tty.h> 26 26 #include <linux/netdevice.h> 27 27 #include <linux/ppp_defs.h> 28 - #include <linux/if_ppp.h> 28 + #include <linux/ppp-ioctl.h> 29 29 #include <linux/skbuff.h> 30 30 #include <linux/proc_fs.h> 31 31 #include <linux/seq_file.h>
+1 -1
drivers/net/ppp/ppp_async.c
··· 26 26 #include <linux/poll.h> 27 27 #include <linux/crc-ccitt.h> 28 28 #include <linux/ppp_defs.h> 29 - #include <linux/if_ppp.h> 29 + #include <linux/ppp-ioctl.h> 30 30 #include <linux/ppp_channel.h> 31 31 #include <linux/spinlock.h> 32 32 #include <linux/init.h>
+1 -1
drivers/net/ppp/ppp_synctty.c
··· 39 39 #include <linux/netdevice.h> 40 40 #include <linux/poll.h> 41 41 #include <linux/ppp_defs.h> 42 - #include <linux/if_ppp.h> 42 + #include <linux/ppp-ioctl.h> 43 43 #include <linux/ppp_channel.h> 44 44 #include <linux/spinlock.h> 45 45 #include <linux/completion.h>
+1 -1
drivers/net/ppp/pppoe.c
··· 72 72 #include <linux/if_pppox.h> 73 73 #include <linux/ppp_channel.h> 74 74 #include <linux/ppp_defs.h> 75 - #include <linux/if_ppp.h> 75 + #include <linux/ppp-ioctl.h> 76 76 #include <linux/notifier.h> 77 77 #include <linux/file.h> 78 78 #include <linux/proc_fs.h>
+1 -1
drivers/net/ppp/pppox.c
··· 28 28 #include <linux/init.h> 29 29 #include <linux/if_pppox.h> 30 30 #include <linux/ppp_defs.h> 31 - #include <linux/if_ppp.h> 31 + #include <linux/ppp-ioctl.h> 32 32 #include <linux/ppp_channel.h> 33 33 #include <linux/kmod.h> 34 34
+1 -1
drivers/tty/ipwireless/network.c
··· 22 22 #include <linux/ppp_channel.h> 23 23 #include <linux/ppp_defs.h> 24 24 #include <linux/slab.h> 25 - #include <linux/if_ppp.h> 25 + #include <linux/ppp-ioctl.h> 26 26 #include <linux/skbuff.h> 27 27 28 28 #include "network.h"
+1 -1
drivers/tty/ipwireless/tty.c
··· 21 21 #include <linux/mutex.h> 22 22 #include <linux/ppp_defs.h> 23 23 #include <linux/if.h> 24 - #include <linux/if_ppp.h> 24 + #include <linux/ppp-ioctl.h> 25 25 #include <linux/sched.h> 26 26 #include <linux/serial.h> 27 27 #include <linux/slab.h>
+1 -1
fs/compat_ioctl.c
··· 34 34 #include <linux/fs.h> 35 35 #include <linux/file.h> 36 36 #include <linux/ppp_defs.h> 37 - #include <linux/if_ppp.h> 37 + #include <linux/ppp-ioctl.h> 38 38 #include <linux/if_pppox.h> 39 39 #include <linux/mtio.h> 40 40 #include <linux/auto_fs.h>
+1 -1
include/linux/isdn.h
··· 187 187 #endif 188 188 189 189 #include <linux/ppp_defs.h> 190 - #include <linux/if_ppp.h> 190 + #include <linux/ppp-ioctl.h> 191 191 192 192 #include <linux/isdn_ppp.h> 193 193 #endif
+1 -1
net/atm/pppoatm.c
··· 44 44 #include <linux/atmdev.h> 45 45 #include <linux/capability.h> 46 46 #include <linux/ppp_defs.h> 47 - #include <linux/if_ppp.h> 47 + #include <linux/ppp-ioctl.h> 48 48 #include <linux/ppp_channel.h> 49 49 #include <linux/atmppp.h> 50 50
+1 -1
net/irda/irnet/irnet.h
··· 254 254 #include <linux/init.h> 255 255 256 256 #include <linux/ppp_defs.h> 257 - #include <linux/if_ppp.h> 257 + #include <linux/ppp-ioctl.h> 258 258 #include <linux/ppp_channel.h> 259 259 260 260 #include <net/irda/irda.h>
+1 -1
net/l2tp/l2tp_ppp.c
··· 82 82 #include <net/sock.h> 83 83 #include <linux/ppp_channel.h> 84 84 #include <linux/ppp_defs.h> 85 - #include <linux/if_ppp.h> 85 + #include <linux/ppp-ioctl.h> 86 86 #include <linux/file.h> 87 87 #include <linux/hash.h> 88 88 #include <linux/sort.h>