summaryrefslogtreecommitdiffstats
path: root/Documentation/networking/l2tp.txt
diff options
context:
space:
mode:
authorPaul Mackerras2012-03-04 13:56:55 +0100
committerDavid S. Miller2012-03-05 02:41:38 +0100
commit4b32da2bcf1de2b7a196a0e48389d231b4472c36 (patch)
tree440b246f9fffb1126ceab28d7aa4c55c59187e11 /Documentation/networking/l2tp.txt
parentppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h (diff)
downloadkernel-qcow2-linux-4b32da2bcf1de2b7a196a0e48389d231b4472c36.tar.gz
kernel-qcow2-linux-4b32da2bcf1de2b7a196a0e48389d231b4472c36.tar.xz
kernel-qcow2-linux-4b32da2bcf1de2b7a196a0e48389d231b4472c36.zip
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>
Diffstat (limited to 'Documentation/networking/l2tp.txt')
-rw-r--r--Documentation/networking/l2tp.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/l2tp.txt b/Documentation/networking/l2tp.txt
index e7bf3979facb..e63fc1f7bf87 100644
--- a/Documentation/networking/l2tp.txt
+++ b/Documentation/networking/l2tp.txt
@@ -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