patch-2.1.1 linux/net/ipv4/arp.c

• Lines: 33
• Date: Wed Oct 2 14:43:06 1996
• Orig file: v2.1.0/linux/net/ipv4/arp.c
• Orig date: Thu Aug 1 15:43:04 1996

diff -u --recursive --new-file v2.1.0/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -1984,13 +1984,14 @@
 	{
 		if (!mask && ip)
 			return -EINVAL;
-		if (!dev)
+		if (!dev) {
 			dev = dev_getbytype(r->arp_ha.sa_family);
+			if (!dev)
+				return -ENODEV;
+		}
 	}
 	else
 	{
-		if (ip_chk_addr(ip) && dev->type != ARPHRD_METRICOM)
-			return -EINVAL;
 		if (!dev)
 		{
 			struct rtable * rt;
@@ -1999,9 +2000,13 @@
 				return -ENETUNREACH;
 			dev = rt->rt_dev;
 			ip_rt_put(rt);
+			if (!dev)
+				return -ENODEV;
 		}
+		if (dev->type != ARPHRD_METRICOM && ip_chk_addr(ip))
+			return -EINVAL;
 	}
-	if (!dev || (dev->flags&(IFF_LOOPBACK|IFF_NOARP)))
+	if (dev->flags & (IFF_LOOPBACK | IFF_NOARP))
 		return -ENODEV;
 
 	if (r->arp_ha.sa_family != dev->type)