[NETFILTER]: Add partial checksum validation helper

[mv-sheeva.git] / net / ipv4 / af_inet.c

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index cad664bf3f2e53311aa74147c33c98f22e09e303..72ae8ed5a3d7143342b1a8fd2a9b2ce599671964 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1251,7 +1251,8 @@ out:
 }
 
 int inet_ctl_sock_create(struct sock **sk, unsigned short family,
-                        unsigned short type, unsigned char protocol)
+                        unsigned short type, unsigned char protocol,
+                        struct net *net)
 {
        struct socket *sock;
        int rc = sock_create_kern(family, type, protocol, &sock);
@@ -1259,12 +1260,13 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,
        if (rc == 0) {
                *sk = sock->sk;
                (*sk)->sk_allocation = GFP_ATOMIC;
-               inet_sk(*sk)->uc_ttl = -1;
                /*
                 * Unhash it so that IP input processing does not even see it,
                 * we do not wish this socket to see incoming packets.
                 */
                (*sk)->sk_prot->unhash(*sk);
+
+               sk_change_net(*sk, net);
        }
        return rc;
 }