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

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

drivers/net/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ static const struct proto_ops pppoe_ops = { 
	.ioctl		= pppox_ioctl,

};



static struct pppox_proto pppoe_proto = {

static const struct pppox_proto pppoe_proto = {

	.create	= pppoe_create,

	.ioctl	= pppoe_ioctl,

	.owner	= THIS_MODULE,

drivers/net/pppox.c

+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ 


#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)

		return -EINVAL;

drivers/net/pptp.c

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static struct pppox_sock **callid_sock; 
static DEFINE_SPINLOCK(chan_lock);



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;



#define PPP_LCP_ECHOREQ 0x09
@@ -628,7 +628,7 @@ static int pptp_ppp_ioctl(struct ppp_channel *chan, unsigned int cmd, 
	return err;

}



static struct ppp_channel_ops pptp_chan_ops = {

static const struct ppp_channel_ops pptp_chan_ops = {

	.start_xmit = pptp_xmit,

	.ioctl      = pptp_ppp_ioctl,

};
@@ -659,12 +659,12 @@ static const struct proto_ops pptp_ops = { 
	.ioctl      = pppox_ioctl,

};



static struct pppox_proto pppox_pptp_proto = {

static const struct pppox_proto pppox_pptp_proto = {

	.create = pptp_create,

	.owner  = THIS_MODULE,

};



static struct gre_protocol gre_pptp_protocol = {

static const struct gre_protocol gre_pptp_protocol = {

	.handler = pptp_rcv,

};

include/linux/if_pppox.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct pppox_proto { 
	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 pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */

extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

net/l2tp/l2tp_ppp.c

+1 −1
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ static const struct proto_ops pppol2tp_ops = { 
	.ioctl		= pppox_ioctl,

};



static struct pppox_proto pppol2tp_proto = {

static const struct pppox_proto pppol2tp_proto = {

	.create		= pppol2tp_create,

	.ioctl		= pppol2tp_ioctl

};