patch-2.1.20 linux/net/ipv6/addrconf.c

• Lines: 121
• Date: Thu Jan 2 14:07:39 1997
• Orig file: v2.1.19/linux/net/ipv6/addrconf.c
• Orig date: Thu Dec 12 17:02:47 1996

diff -u --recursive --new-file v2.1.19/linux/net/ipv6/addrconf.c linux/net/ipv6/addrconf.c
@@ -851,34 +851,47 @@
 int addrconf_set_dstaddr(void *arg)
 {
 	struct in6_ifreq ireq;
+	struct inet6_dev *idev;
 	struct device *dev;
-	int err;
+	int err = -EINVAL;
 
-	err = copy_from_user(&ireq, arg, sizeof(struct in6_ifreq));
-	
-	if (err)
-		return -EFAULT;
+	if (copy_from_user(&ireq, arg, sizeof(struct in6_ifreq)))
+	{
+		err = -EFAULT;
+		goto err_exit;
+	}
+
+	idev = ipv6_dev_by_index(ireq.ifr6_ifindex);
+
+	if (idev == NULL)
+	{
+		err = -ENODEV;
+		goto err_exit;
+	}
 
-	dev = dev_get(ireq.devname);
+	dev = idev->dev;
 
 	if (dev->type == ARPHRD_SIT)
 	{
 		struct device *dev;
 		
-		if (!(ipv6_addr_type(&ireq.addr) & IPV6_ADDR_COMPATv4))
+		if (!(ipv6_addr_type(&ireq.ifr6_addr) & IPV6_ADDR_COMPATv4))
 		{
 			return -EADDRNOTAVAIL;
 		}
 		
-		dev = sit_add_tunnel(ireq.addr.s6_addr32[3]);
+		dev = sit_add_tunnel(ireq.ifr6_addr.s6_addr32[3]);
 		
 		if (dev == NULL)
-			return -ENODEV;
-
-		return 0;
+		{
+			err = -ENODEV;
+		}
+		else
+			err = 0;
 	}
-	
-	return -EINVAL;
+
+err_exit:
+	return err;
 }
 
 /*
@@ -934,20 +947,17 @@
 	if (err)
 		return -EFAULT;
 
-	dev = dev_get(ireq.devname);
-
-	if (dev == NULL)
-		return -EINVAL;
-
-	in6_dev = ipv6_get_idev(dev);
+	in6_dev = ipv6_dev_by_index(ireq.ifr6_ifindex);
 
 	if (in6_dev == NULL)
 		return -EINVAL;
 
-	addr_type  = ipv6_addr_type(&ireq.addr);
+	dev = in6_dev->dev;
+	
+	addr_type  = ipv6_addr_type(&ireq.ifr6_addr);
 	addr_type &= IPV6_ADDR_SCOPE_MASK;
 	
-	ifp = ipv6_add_addr(in6_dev, &ireq.addr, addr_type);
+	ifp = ipv6_add_addr(in6_dev, &ireq.ifr6_addr, addr_type);
 
 	if (ifp == NULL)
 		return -ENOMEM;
@@ -959,12 +969,12 @@
 		struct in6_addr maddr;
 
 		/* join to solicited addr multicast group */
-		addrconf_addr_solict_mult(&ireq.addr, &maddr);
+		addrconf_addr_solict_mult(&ireq.ifr6_addr, &maddr);
 		ipv6_dev_mc_inc(dev, &maddr);
 	}
 
 
-	ifp->prefix_len = ireq.prefix_len;
+	ifp->prefix_len = ireq.ifr6_prefixlen;
 	ifp->flags |= ADDR_PERMANENT;
 
 	if (!(dev->flags & (IFF_NOARP|IFF_LOOPBACK)))
@@ -1150,7 +1160,7 @@
 
 	ifp = (struct inet6_ifaddr *) data;
 
-	if (ifp->probes-- == 0)
+	if (--ifp->probes == 0)
 	{
 		/*
 		 * DAD was successful
@@ -1415,9 +1425,3 @@
 
 	proc_unregister(&proc_net, iface_proc_entry.low_ino);
 }
-
-/*
- * Local variables:
- * c-file-style: "Linux"
- * End:
- */