[IPV6] ADDRCONF: Convert ipv6_get_saddr() to ipv6_dev_get_saddr().

[deliverable/linux.git] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 6f20086064b21843d3ea88ba8f53c10e15b65a26..8897ccf8086afacfc643163e89b740cc4a6df13c 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -291,7 +291,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                        if (!sk->sk_bound_dev_if)
                                goto out;
 
-                       dev = dev_get_by_index(&init_net, sk->sk_bound_dev_if);
+                       dev = dev_get_by_index(sk->sk_net, sk->sk_bound_dev_if);
                        if (!dev) {
                                err = -ENODEV;
                                goto out;
@@ -304,7 +304,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
                v4addr = LOOPBACK4_IPV6;
                if (!(addr_type & IPV6_ADDR_MULTICAST)) {
                        err = -EADDRNOTAVAIL;
-                       if (!ipv6_chk_addr(&init_net, &addr->sin6_addr,
+                       if (!ipv6_chk_addr(sk->sk_net, &addr->sin6_addr,
                                           dev, 0)) {
                                if (dev)
                                        dev_put(dev);
@@ -641,6 +641,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
        skb_reserve(skb, hh_len);
 
        skb->priority = sk->sk_priority;
+       skb->mark = sk->sk_mark;
        skb->dst = dst_clone(&rt->u.dst);
 
        skb_put(skb, length);
@@ -767,6 +768,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
         */
        memset(&fl, 0, sizeof(fl));
 
+       fl.mark = sk->sk_mark;
+
        if (sin6) {
                if (addr_len < SIN6_LEN_RFC2133)
                        return -EINVAL;
@@ -1259,7 +1262,7 @@ static const struct seq_operations raw6_seq_ops = {
 
 static int raw6_seq_open(struct inode *inode, struct file *file)
 {
-       return raw_seq_open(file, &raw_v6_hashinfo, PF_INET6);
+       return raw_seq_open(inode, file, &raw_v6_hashinfo, &raw6_seq_ops);
 }
 
 static const struct file_operations raw6_seq_fops = {
@@ -1267,19 +1270,35 @@ static const struct file_operations raw6_seq_fops = {
        .open =         raw6_seq_open,
        .read =         seq_read,
        .llseek =       seq_lseek,
-       .release =      seq_release_private,
+       .release =      seq_release_net,
 };
 
-int __init raw6_proc_init(void)
+static int raw6_init_net(struct net *net)
 {
-       if (!proc_net_fops_create(&init_net, "raw6", S_IRUGO, &raw6_seq_fops))
+       if (!proc_net_fops_create(net, "raw6", S_IRUGO, &raw6_seq_fops))
                return -ENOMEM;
+
        return 0;
 }
 
+static void raw6_exit_net(struct net *net)
+{
+       proc_net_remove(net, "raw6");
+}
+
+static struct pernet_operations raw6_net_ops = {
+       .init = raw6_init_net,
+       .exit = raw6_exit_net,
+};
+
+int __init raw6_proc_init(void)
+{
+       return register_pernet_subsys(&raw6_net_ops);
+}
+
 void raw6_proc_exit(void)
 {
-       proc_net_remove(&init_net, "raw6");
+       unregister_pernet_subsys(&raw6_net_ops);
 }
 #endif /* CONFIG_PROC_FS */