diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 10:48:22 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 10:48:22 +1000 |
commit | d17df4292ed40aebb288d56374695ec789245f04 (patch) | |
tree | 586638c84c56c7613deff268d7abf8bb2c0e5625 /drivers/net/pppol2tp.c | |
parent | 8cc5f00a45e291f2ccbfb45b6b8190e42e65a31d (diff) | |
parent | 4e36a95e591e9c58dd10bb4103c00993917c27fd (diff) |
Merge commit 'net-current/master'
Diffstat (limited to 'drivers/net/pppol2tp.c')
-rw-r--r-- | drivers/net/pppol2tp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c index e0f9219a0aea..cc394d073755 100644 --- a/drivers/net/pppol2tp.c +++ b/drivers/net/pppol2tp.c @@ -229,7 +229,7 @@ static void pppol2tp_tunnel_free(struct pppol2tp_tunnel *tunnel); static atomic_t pppol2tp_tunnel_count; static atomic_t pppol2tp_session_count; static struct ppp_channel_ops pppol2tp_chan_ops = { pppol2tp_xmit , NULL }; -static struct proto_ops pppol2tp_ops; +static const struct proto_ops pppol2tp_ops; /* per-net private data for this module */ static int pppol2tp_net_id; @@ -2574,7 +2574,7 @@ static const struct file_operations pppol2tp_proc_fops = { * Init and cleanup *****************************************************************************/ -static struct proto_ops pppol2tp_ops = { +static const struct proto_ops pppol2tp_ops = { .family = AF_PPPOX, .owner = THIS_MODULE, .release = pppol2tp_release, |