diff options
author | Denis V. Lunev <den@openvz.org> | 2008-03-24 18:29:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-24 18:29:23 -0400 |
commit | 0e6bd4a1c6c3881c9ed82985ecb9824d4450c4ba (patch) | |
tree | 6a8e2513b1c5b3285a559fccf70100b8fe8826e3 /include/net/ip.h | |
parent | ffc31d3d7719555cd784ecaf82e9c237f3a747ab (diff) |
[NETNS]: Add namespace parameter to ip_options_compile.
ip_options_compile uses inet_addr_type which requires a namespace. The
packet argument is optional, so parameter is the only way to obtain
it. Pass the init_net there for now.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip.h')
-rw-r--r-- | include/net/ip.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 9f50d4f1f157..bcc3afa3df36 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -347,7 +347,8 @@ 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 | struct ip_options *opt, struct sk_buff *skb); | ||
351 | extern int ip_options_get(struct ip_options **optp, | 352 | extern int ip_options_get(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 ip_options **optp, |