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

• Lines: 28
• Date: Tue Dec 26 06:03:01 1995
• Orig file: v1.3.50/linux/net/ipv4/arp.c
• Orig date: Wed Dec 13 09:02:47 1995

diff -u --recursive --new-file v1.3.50/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -895,15 +895,22 @@
  */
 
 /*
- *	try to switch to alias device whose address is tip, if any
+ *	try to switch to alias device whose addr is tip or closest to sip.
  */
 
 #ifdef CONFIG_NET_ALIAS
-	if (net_alias_has(dev))
+	if (tip != dev->pa_addr && net_alias_has(skb->dev)) 
 	{
-		struct device *adev;
-		adev = net_alias_chk32(dev,AF_INET,tip,IFF_UP,IFF_NOARP);
-		if (adev != NULL) dev = adev;
+		/*
+		 *	net_alias_dev_rcv_sel32 returns main dev if it fails to found other.
+		 */
+		dev = net_alias_dev_rcv_sel32(dev, AF_INET, sip, tip);
+
+		if (dev->type != ntohs(arp->ar_hrd) || dev->flags & IFF_NOARP)
+		{
+			kfree_skb(skb, FREE_READ);
+			return 0;
+		}
 	}
 #endif