Commit 756e64a0 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: constify some ppp/pptp structs

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9478e38
...@@ -1124,7 +1124,7 @@ static const struct proto_ops pppoe_ops = { ...@@ -1124,7 +1124,7 @@ static const struct proto_ops pppoe_ops = {
.ioctl = pppox_ioctl, .ioctl = pppox_ioctl,
}; };
static struct pppox_proto pppoe_proto = { static const struct pppox_proto pppoe_proto = {
.create = pppoe_create, .create = pppoe_create,
.ioctl = pppoe_ioctl, .ioctl = pppoe_ioctl,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
static struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1]; static const struct pppox_proto *pppox_protos[PX_MAX_PROTO + 1];
int register_pppox_proto(int proto_num, struct pppox_proto *pp) int register_pppox_proto(int proto_num, const struct pppox_proto *pp)
{ {
if (proto_num < 0 || proto_num > PX_MAX_PROTO) if (proto_num < 0 || proto_num > PX_MAX_PROTO)
return -EINVAL; return -EINVAL;
......
...@@ -53,7 +53,7 @@ static struct pppox_sock **callid_sock; ...@@ -53,7 +53,7 @@ static struct pppox_sock **callid_sock;
static DEFINE_SPINLOCK(chan_lock); static DEFINE_SPINLOCK(chan_lock);
static struct proto pptp_sk_proto __read_mostly; static struct proto pptp_sk_proto __read_mostly;
static struct ppp_channel_ops pptp_chan_ops; static const struct ppp_channel_ops pptp_chan_ops;
static const struct proto_ops pptp_ops; static const struct proto_ops pptp_ops;
#define PPP_LCP_ECHOREQ 0x09 #define PPP_LCP_ECHOREQ 0x09
...@@ -628,7 +628,7 @@ static int pptp_ppp_ioctl(struct ppp_channel *chan, unsigned int cmd, ...@@ -628,7 +628,7 @@ static int pptp_ppp_ioctl(struct ppp_channel *chan, unsigned int cmd,
return err; return err;
} }
static struct ppp_channel_ops pptp_chan_ops = { static const struct ppp_channel_ops pptp_chan_ops = {
.start_xmit = pptp_xmit, .start_xmit = pptp_xmit,
.ioctl = pptp_ppp_ioctl, .ioctl = pptp_ppp_ioctl,
}; };
...@@ -659,12 +659,12 @@ static const struct proto_ops pptp_ops = { ...@@ -659,12 +659,12 @@ static const struct proto_ops pptp_ops = {
.ioctl = pppox_ioctl, .ioctl = pppox_ioctl,
}; };
static struct pppox_proto pppox_pptp_proto = { static const struct pppox_proto pppox_pptp_proto = {
.create = pptp_create, .create = pptp_create,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static struct gre_protocol gre_pptp_protocol = { static const struct gre_protocol gre_pptp_protocol = {
.handler = pptp_rcv, .handler = pptp_rcv,
}; };
......
...@@ -204,7 +204,7 @@ struct pppox_proto { ...@@ -204,7 +204,7 @@ struct pppox_proto {
struct module *owner; struct module *owner;
}; };
extern int register_pppox_proto(int proto_num, struct pppox_proto *pp); extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
extern void unregister_pppox_proto(int proto_num); extern void unregister_pppox_proto(int proto_num);
extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */ extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */
extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
......
...@@ -1768,7 +1768,7 @@ static const struct proto_ops pppol2tp_ops = { ...@@ -1768,7 +1768,7 @@ static const struct proto_ops pppol2tp_ops = {
.ioctl = pppox_ioctl, .ioctl = pppox_ioctl,
}; };
static struct pppox_proto pppol2tp_proto = { static const struct pppox_proto pppol2tp_proto = {
.create = pppol2tp_create, .create = pppol2tp_create,
.ioctl = pppol2tp_ioctl .ioctl = pppol2tp_ioctl
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment