summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-17 02:46:48 +0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-30 03:01:39 +0400
commit4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d (patch)
treea11270e23933664056cfd3d53e3ae2a661515d23 /include
parent6ed8a48582c08432e84e5610564c1d25fe00dd7f (diff)
downloadlinux-4c6ea29d82e0d1b9b37e6b879e0a7fd6c409333d.tar.xz
[IP]: Introduce ip_options_get_from_user
This variant is needed to satisfy sparse __user annotations. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/ip.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 7623e414a5fb..e4563bbee6ea 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -335,7 +335,10 @@ extern void ip_options_build(struct sk_buff *skb, struct ip_options *opt, u32 da
extern int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb);
extern void ip_options_fragment(struct sk_buff *skb);
extern int ip_options_compile(struct ip_options *opt, struct sk_buff *skb);
-extern int ip_options_get(struct ip_options **optp, unsigned char *data, int optlen, int user);
+extern int ip_options_get(struct ip_options **optp,
+ unsigned char *data, int optlen);
+extern int ip_options_get_from_user(struct ip_options **optp,
+ unsigned char __user *data, int optlen);
extern void ip_options_undo(struct ip_options * opt);
extern void ip_forward_options(struct sk_buff *skb);
extern int ip_options_rcv_srr(struct sk_buff *skb);