summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_input.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-03-24 15:29:23 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-24 15:29:23 -0700
commit0e6bd4a1c6c3881c9ed82985ecb9824d4450c4ba (patch)
tree6a8e2513b1c5b3285a559fccf70100b8fe8826e3 /net/ipv4/ip_input.c
parentffc31d3d7719555cd784ecaf82e9c237f3a747ab (diff)
downloadlinux-0e6bd4a1c6c3881c9ed82985ecb9824d4450c4ba.tar.bz2
[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 'net/ipv4/ip_input.c')
-rw-r--r--net/ipv4/ip_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index e3a0c78fa7bf..f3a7a08a463f 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -286,7 +286,7 @@ static inline int ip_rcv_options(struct sk_buff *skb)
opt = &(IPCB(skb)->opt);
opt->optlen = iph->ihl*4 - sizeof(struct iphdr);
- if (ip_options_compile(opt, skb)) {
+ if (ip_options_compile(&init_net, opt, skb)) {
IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
goto drop;
}