diff options
Diffstat (limited to 'include/net/ip.h')
-rw-r--r-- | include/net/ip.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 9f50d4f1f157..6d7bcd5e62d4 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -347,10 +347,11 @@ extern int ip_forward(struct sk_buff *skb); | |||
347 | extern void ip_options_build(struct sk_buff *skb, struct ip_options *opt, __be32 daddr, struct rtable *rt, int is_frag); | 347 | extern void ip_options_build(struct sk_buff *skb, struct ip_options *opt, __be32 daddr, struct rtable *rt, int is_frag); |
348 | extern int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb); | 348 | extern int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb); |
349 | extern void ip_options_fragment(struct sk_buff *skb); | 349 | extern void ip_options_fragment(struct sk_buff *skb); |
350 | extern int ip_options_compile(struct ip_options *opt, struct sk_buff *skb); | 350 | extern int ip_options_compile(struct net *net, |
351 | extern int ip_options_get(struct ip_options **optp, | 351 | struct ip_options *opt, struct sk_buff *skb); |
352 | extern int ip_options_get(struct net *net, struct ip_options **optp, | ||
352 | unsigned char *data, int optlen); | 353 | unsigned char *data, int optlen); |
353 | extern int ip_options_get_from_user(struct ip_options **optp, | 354 | extern int ip_options_get_from_user(struct net *net, struct ip_options **optp, |
354 | unsigned char __user *data, int optlen); | 355 | unsigned char __user *data, int optlen); |
355 | extern void ip_options_undo(struct ip_options * opt); | 356 | extern void ip_options_undo(struct ip_options * opt); |
356 | extern void ip_forward_options(struct sk_buff *skb); | 357 | extern void ip_forward_options(struct sk_buff *skb); |
@@ -361,7 +362,8 @@ extern int ip_options_rcv_srr(struct sk_buff *skb); | |||
361 | */ | 362 | */ |
362 | 363 | ||
363 | extern void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb); | 364 | extern void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb); |
364 | extern int ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc); | 365 | extern int ip_cmsg_send(struct net *net, |
366 | struct msghdr *msg, struct ipcm_cookie *ipc); | ||
365 | extern int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, int optlen); | 367 | extern int ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, int optlen); |
366 | extern int ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen); | 368 | extern int ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen); |
367 | extern int compat_ip_setsockopt(struct sock *sk, int level, | 369 | extern int compat_ip_setsockopt(struct sock *sk, int level, |