Commit d7100da0 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

ppp: make channel_ops const 



The PPP channel ops structure should be const.
Cleanup the declarations to use standard C99 format.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b5bac2b

drivers/char/pcmcia/ipwireless/network.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int ipwireless_ppp_ioctl(struct ppp_channel *ppp_channel, 
	return err;

}



static struct ppp_channel_ops ipwireless_ppp_channel_ops = {

static const struct ppp_channel_ops ipwireless_ppp_channel_ops = {

	.start_xmit = ipwireless_ppp_start_xmit,

	.ioctl      = ipwireless_ppp_ioctl

};

drivers/net/ppp_async.c

+3 −3
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ static void ppp_async_process(unsigned long arg); 
static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,

			   int len, int inbound);



static struct ppp_channel_ops async_ops = {

	ppp_async_send,

	ppp_async_ioctl

static const struct ppp_channel_ops async_ops = {

	.start_xmit = ppp_async_send,

	.ioctl      = ppp_async_ioctl,

};



/*

drivers/net/ppp_synctty.c

+3 −3
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ static void ppp_sync_flush_output(struct syncppp *ap); 
static void ppp_sync_input(struct syncppp *ap, const unsigned char *buf,

			   char *flags, int count);



static struct ppp_channel_ops sync_ops = {

	ppp_sync_send,

	ppp_sync_ioctl

static const struct ppp_channel_ops sync_ops = {

	.start_xmit = ppp_sync_send,

	.ioctl      = ppp_sync_ioctl,

};



/*

drivers/net/pppoe.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);



static const struct proto_ops pppoe_ops;

static struct ppp_channel_ops pppoe_chan_ops;

static const struct ppp_channel_ops pppoe_chan_ops;



/* per-net private data for this module */

static int pppoe_net_id __read_mostly;
@@ -963,7 +963,7 @@ static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) 
	return __pppoe_xmit(sk, skb);

}



static struct ppp_channel_ops pppoe_chan_ops = {

static const struct ppp_channel_ops pppoe_chan_ops = {

	.start_xmit = pppoe_xmit,

};

include/linux/ppp_channel.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct ppp_channel_ops { 


struct ppp_channel {

	void		*private;	/* channel private data */

	struct ppp_channel_ops *ops;	/* operations for this channel */

	const struct ppp_channel_ops *ops; /* operations for this channel */

	int		mtu;		/* max transmit packet size */

	int		hdrlen;		/* amount of headroom channel needs */

	void		*ppp;		/* opaque to channel */