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

• Lines: 35
• Date: Sat Nov 7 11:00:32 1998
• Orig file: v2.1.126/linux/net/ipv4/arp.c
• Orig date: Fri Oct 9 13:27:17 1998

diff -u --recursive --new-file v2.1.126/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -1,6 +1,6 @@
 /* linux/net/inet/arp.c
  *
- * Version:	$Id: arp.c,v 1.70 1998/08/26 12:03:18 davem Exp $
+ * Version:	$Id: arp.c,v 1.74 1998/11/01 22:15:06 davem Exp $
  *
  * Copyright (C) 1994 by Florian  La Roche
  *
@@ -431,7 +431,7 @@
 	 *	No arp on this interface.
 	 */
 	
-	if (dev->flags&(IFF_NOARP|IFF_NODYNARP))
+	if (dev->flags&IFF_NOARP)
 		return;
 
 	/*
@@ -547,7 +547,7 @@
  */  
 	if (in_dev == NULL ||
 	    arp->ar_hln != dev->addr_len    || 
-	    dev->flags & (IFF_NOARP|IFF_NODYNARP) ||
+	    dev->flags & IFF_NOARP ||
 	    skb->pkt_type == PACKET_OTHERHOST ||
 	    skb->pkt_type == PACKET_LOOPBACK ||
 	    arp->ar_pln != 4)
@@ -1027,7 +1027,7 @@
 				"%-17s0x%-10x0x%-10x%s",
 				in_ntoa(*(u32*)n->key),
 				hatype,
-				ATF_PUBL|ATF_PERM,       
+ 				ATF_PUBL|ATF_PERM,
 				"00:00:00:00:00:00");
 			size += sprintf(buffer+len+size,
 				 "     %-17s %s\n",