git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
ipv6
/
ip6_flowlabel.c
diff --git
a/net/ipv6/ip6_flowlabel.c
b/net/ipv6/ip6_flowlabel.c
index
22ff734
..
2c5aab0
100644
(file)
--- a/
net/ipv6/ip6_flowlabel.c
+++ b/
net/ipv6/ip6_flowlabel.c
@@
-277,7
+277,7
@@
static int fl6_renew(struct ip6_flowlabel *fl, unsigned long linger, unsigned lo
}
static struct ip6_flowlabel *
}
static struct ip6_flowlabel *
-fl_create(struct in6_flowlabel_req *freq, char *optval, int optlen, int *err_p)
+fl_create(struct in6_flowlabel_req *freq, char
__user
*optval, int optlen, int *err_p)
{
struct ip6_flowlabel *fl;
int olen;
{
struct ip6_flowlabel *fl;
int olen;
@@
-407,7
+407,7
@@
static int ipv6_opt_cmp(struct ipv6_txoptions *o1, struct ipv6_txoptions *o2)
return 0;
}
return 0;
}
-int ipv6_flowlabel_opt(struct sock *sk, char *optval, int optlen)
+int ipv6_flowlabel_opt(struct sock *sk, char
__user
*optval, int optlen)
{
int err;
struct ipv6_pinfo *np = inet6_sk(sk);
{
int err;
struct ipv6_pinfo *np = inet6_sk(sk);
@@
-645,8
+645,8
@@
static void ip6fl_fl_seq_show(struct seq_file *seq, struct ip6_flowlabel *fl)
static int ip6fl_seq_show(struct seq_file *seq, void *v)
{
if (v == SEQ_START_TOKEN)
static int ip6fl_seq_show(struct seq_file *seq, void *v)
{
if (v == SEQ_START_TOKEN)
- seq_p
rintf
(seq, "Label S Owner Users Linger Expires "
-
"Dst Opt\n");
+ seq_p
uts
(seq, "Label S Owner Users Linger Expires "
+ "Dst Opt\n");
else
ip6fl_fl_seq_show(seq, v);
return 0;
else
ip6fl_fl_seq_show(seq, v);
return 0;
@@
-692,14
+692,14
@@
static struct file_operations ip6fl_seq_fops = {
#endif
#endif
-void ip6_flowlabel_init()
+void ip6_flowlabel_init(
void
)
{
#ifdef CONFIG_PROC_FS
proc_net_fops_create("ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops);
#endif
}
{
#ifdef CONFIG_PROC_FS
proc_net_fops_create("ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops);
#endif
}
-void ip6_flowlabel_cleanup()
+void ip6_flowlabel_cleanup(
void
)
{
del_timer(&ip6_fl_gc_timer);
#ifdef CONFIG_PROC_FS
{
del_timer(&ip6_fl_gc_timer);
#ifdef CONFIG_PROC_FS