Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d7100da026317fcf07411f765fe1cdb044053917

Authored by stephen hemminger
Committed by David S. Miller
1 parent 3b5bac2bde
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ppp: make channel_ops const 

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

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 8 changed files with 16 additions and 13 deletions Side-by-side Diff

drivers/char/pcmcia/ipwireless/network.c
Diff comments   View file @ d7100da
... ... @@ -239,7 +239,7 @@
239 239 return err;
240 240 }
241 241  
242   -static struct ppp_channel_ops ipwireless_ppp_channel_ops = {
  242 +static const struct ppp_channel_ops ipwireless_ppp_channel_ops = {
243 243 .start_xmit = ipwireless_ppp_start_xmit,
244 244 .ioctl = ipwireless_ppp_ioctl
245 245 };
drivers/net/ppp_async.c
Diff comments   View file @ d7100da
... ... @@ -108,9 +108,9 @@
108 108 static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
109 109 int len, int inbound);
110 110  
111   -static struct ppp_channel_ops async_ops = {
112   - ppp_async_send,
113   - ppp_async_ioctl
  111 +static const struct ppp_channel_ops async_ops = {
  112 + .start_xmit = ppp_async_send,
  113 + .ioctl = ppp_async_ioctl,
114 114 };
115 115  
116 116 /*
drivers/net/ppp_synctty.c
Diff comments   View file @ d7100da
... ... @@ -97,9 +97,9 @@
97 97 static void ppp_sync_input(struct syncppp *ap, const unsigned char *buf,
98 98 char *flags, int count);
99 99  
100   -static struct ppp_channel_ops sync_ops = {
101   - ppp_sync_send,
102   - ppp_sync_ioctl
  100 +static const struct ppp_channel_ops sync_ops = {
  101 + .start_xmit = ppp_sync_send,
  102 + .ioctl = ppp_sync_ioctl,
103 103 };
104 104  
105 105 /*
... ... @@ -92,7 +92,7 @@
92 92 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
93 93  
94 94 static const struct proto_ops pppoe_ops;
95   -static struct ppp_channel_ops pppoe_chan_ops;
  95 +static const struct ppp_channel_ops pppoe_chan_ops;
96 96  
97 97 /* per-net private data for this module */
98 98 static int pppoe_net_id __read_mostly;
... ... @@ -963,7 +963,7 @@
963 963 return __pppoe_xmit(sk, skb);
964 964 }
965 965  
966   -static struct ppp_channel_ops pppoe_chan_ops = {
  966 +static const struct ppp_channel_ops pppoe_chan_ops = {
967 967 .start_xmit = pppoe_xmit,
968 968 };
969 969  
include/linux/ppp_channel.h
Diff comments   View file @ d7100da
... ... @@ -36,7 +36,7 @@
36 36  
37 37 struct ppp_channel {
38 38 void *private; /* channel private data */
39   - struct ppp_channel_ops *ops; /* operations for this channel */
  39 + const struct ppp_channel_ops *ops; /* operations for this channel */
40 40 int mtu; /* max transmit packet size */
41 41 int hdrlen; /* amount of headroom channel needs */
42 42 void *ppp; /* opaque to channel */
... ... @@ -260,7 +260,7 @@
260 260 return -ENOTTY;
261 261 }
262 262  
263   -static /*const*/ struct ppp_channel_ops pppoatm_ops = {
  263 +static const struct ppp_channel_ops pppoatm_ops = {
264 264 .start_xmit = pppoatm_send,
265 265 .ioctl = pppoatm_devppp_ioctl,
266 266 };
net/irda/irnet/irnet_ppp.c
Diff comments   View file @ d7100da
... ... @@ -20,7 +20,7 @@
20 20 /* Please put other headers in irnet.h - Thanks */
21 21  
22 22 /* Generic PPP callbacks (to call us) */
23   -static struct ppp_channel_ops irnet_ppp_ops = {
  23 +static const struct ppp_channel_ops irnet_ppp_ops = {
24 24 .start_xmit = ppp_irnet_send,
25 25 .ioctl = ppp_irnet_ioctl
26 26 };
... ... @@ -135,7 +135,10 @@
135 135  
136 136 static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb);
137 137  
138   -static struct ppp_channel_ops pppol2tp_chan_ops = { pppol2tp_xmit , NULL };
  138 +static const struct ppp_channel_ops pppol2tp_chan_ops = {
  139 + .start_xmit = pppol2tp_xmit,
  140 +};
  141 +
139 142 static const struct proto_ops pppol2tp_ops;
140 143  
141 144 /* Helpers to obtain tunnel/session contexts from sockets.