lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: constify some ppp/pptp structs

Browse Source 
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2010-09-21 06:43:54 +00:00
committed by David S. Miller
parent a9478e3861
commit 756e64a0b1
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/pppoe.c
View File

@@ -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,

4
drivers/net/pppox.c
View File

@@ -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;

8
drivers/net/pptp.c
View File

@@ -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,
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 = {
.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,
}; };

2
include/linux/if_pppox.h
View File

@@ -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);

2
net/l2tp/l2tp_ppp.c
View File

@@ -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
}; };