aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2012-03-04 07:56:04 -0500
committerDavid S. Miller <davem@davemloft.net>2012-03-04 20:41:38 -0500
commitbf7daebb9fba540cb8864f435f153678b3e5c171 (patch)
treedc825997a817db8c1f8b2bf930de10a428aaa796 /drivers
parent784db3f06228da81627d23052a6d2ecc38db001a (diff)
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: Paul Mackerras <paulus@samba.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ppp/ppp_generic.c4
-rw-r--r--drivers/net/ppp/pptp.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 6d4d2ebb0a8a..159da2905fe9 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -32,7 +32,7 @@
32#include <linux/poll.h> 32#include <linux/poll.h>
33#include <linux/ppp_defs.h> 33#include <linux/ppp_defs.h>
34#include <linux/filter.h> 34#include <linux/filter.h>
35#include <linux/if_ppp.h> 35#include <linux/ppp-ioctl.h>
36#include <linux/ppp_channel.h> 36#include <linux/ppp_channel.h>
37#include <linux/ppp-comp.h> 37#include <linux/ppp-comp.h>
38#include <linux/skbuff.h> 38#include <linux/skbuff.h>
@@ -1031,7 +1031,7 @@ static void ppp_setup(struct net_device *dev)
1031{ 1031{
1032 dev->netdev_ops = &ppp_netdev_ops; 1032 dev->netdev_ops = &ppp_netdev_ops;
1033 dev->hard_header_len = PPP_HDRLEN; 1033 dev->hard_header_len = PPP_HDRLEN;
1034 dev->mtu = PPP_MTU; 1034 dev->mtu = PPP_MRU;
1035 dev->addr_len = 0; 1035 dev->addr_len = 0;
1036 dev->tx_queue_len = 3; 1036 dev->tx_queue_len = 3;
1037 dev->type = ARPHRD_PPP; 1037 dev->type = ARPHRD_PPP;
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index 234cd9d87ed9..885dbdd9c39e 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -23,7 +23,7 @@
23#include <linux/ppp_channel.h> 23#include <linux/ppp_channel.h>
24#include <linux/ppp_defs.h> 24#include <linux/ppp_defs.h>
25#include <linux/if_pppox.h> 25#include <linux/if_pppox.h>
26#include <linux/if_ppp.h> 26#include <linux/ppp-ioctl.h>
27#include <linux/notifier.h> 27#include <linux/notifier.h>
28#include <linux/file.h> 28#include <linux/file.h>
29#include <linux/in.h> 29#include <linux/in.h>
@@ -481,7 +481,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
481 481
482 po->chan.mtu = dst_mtu(&rt->dst); 482 po->chan.mtu = dst_mtu(&rt->dst);
483 if (!po->chan.mtu) 483 if (!po->chan.mtu)
484 po->chan.mtu = PPP_MTU; 484 po->chan.mtu = PPP_MRU;
485 ip_rt_put(rt); 485 ip_rt_put(rt);
486 po->chan.mtu -= PPTP_HEADER_OVERHEAD; 486 po->chan.mtu -= PPTP_HEADER_OVERHEAD;
487 487