]> git.openpandora.org Git - pandora-kernel.git/commitdiff
[NETNS]: Process INET socket layer in the correct namespace.
authorDenis V. Lunev <den@openvz.org>
Mon, 24 Mar 2008 22:31:35 +0000 (15:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Mar 2008 22:31:35 +0000 (15:31 -0700)
Replace all the reast of the init_net with a proper net on the socket
layer.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/af_inet.c
net/ipv4/inet_connection_sock.c
net/ipv4/raw.c
net/ipv4/udp.c

index 44f5ce1fbfa4849c6c00941b978d799b56a121df..a9e241cdc5b2542bb527e24c9d0a7b244ff19de0 100644 (file)
@@ -446,7 +446,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        if (addr_len < sizeof(struct sockaddr_in))
                goto out;
 
-       chk_addr_ret = inet_addr_type(&init_net, addr->sin_addr.s_addr);
+       chk_addr_ret = inet_addr_type(sk->sk_net, addr->sin_addr.s_addr);
 
        /* Not specified by any standard per-se, however it breaks too
         * many applications when removed.  It is unfortunate since
@@ -1114,7 +1114,7 @@ int inet_sk_rebuild_header(struct sock *sk)
        };
 
        security_sk_classify_flow(sk, &fl);
-       err = ip_route_output_flow(&init_net, &rt, &fl, sk, 0);
+       err = ip_route_output_flow(sk->sk_net, &rt, &fl, sk, 0);
 }
        if (!err)
                sk_setup_caps(sk, &rt->u.dst);
Simple merge
diff --cc net/ipv4/raw.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge