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

• Lines: 82
• Date: Mon Mar 31 12:52:32 1997
• Orig file: v2.1.30/linux/net/ipv4/arp.c
• Orig date: Thu Mar 27 14:40:15 1997

diff -u --recursive --new-file v2.1.30/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -348,7 +348,7 @@
 	return;
 }
 
-static void __inline__ arp_free(struct arp_table **entryp)
+static void arp_free(struct arp_table **entryp)
 {
 	struct arp_table *entry = *entryp;
 	*entryp = entry->u.next;
@@ -802,7 +802,7 @@
 	if (how > 1 && arp_unres_size >= ARP_MAX_UNRES) {
 		arp_unres_expire();
 		if (arp_unres_size >= ARP_MAX_UNRES) {
-			printk("arp_unres_size=%d\n", arp_unres_size);
+			printk(KERN_DEBUG "arp_unres_size=%d\n", arp_unres_size);
 			return NULL;
 		}
 	}
@@ -1817,16 +1817,6 @@
 			if (err)
 				return -EFAULT;
 			break;
-		case OLD_SIOCDARP:
-		case OLD_SIOCSARP:
-			if (!suser())
-				return -EPERM;
-		case OLD_SIOCGARP:
-			err = copy_from_user(&r, arg, sizeof(struct arpreq_old));
-			if (err)
-				return -EFAULT;
-			memset(&r.arp_dev, 0, sizeof(r.arp_dev));
-			break;
 		default:
 			return -EINVAL;
 	}
@@ -1857,46 +1847,10 @@
 		        return arp_req_delete(&r, dev);
 		case SIOCSARP:
 			return arp_req_set(&r, dev);
-		case OLD_SIOCDARP:
-			/* old  SIOCDARP destroys both
-			 * normal and proxy mappings
-			 */
-			r.arp_flags &= ~ATF_PUBL;
-			err = arp_req_delete(&r, dev);
-			r.arp_flags |= ATF_PUBL;
-			if (!err)
-				arp_req_delete(&r, dev);
-			else
-				err = arp_req_delete(&r, dev);
-			return err;
-		case OLD_SIOCSARP:
-			err = arp_req_set(&r, dev);
-			/* old SIOCSARP works so funny,
-			 * that its behaviour can be emulated
-			 * only approximately 8).
-			 * It should work. --ANK
-			 */
-			if (r.arp_flags & ATF_PUBL)
-			{	
-				r.arp_flags &= ~ATF_PUBL;
-				arp_req_delete(&r, dev);
-			}
-			return err;
 		case SIOCGARP:
 			err = arp_req_get(&r, dev);
 			if (!err)
 				err = copy_to_user(arg, &r, sizeof(r));
-			return err;
-		case OLD_SIOCGARP:
-			r.arp_flags &= ~ATF_PUBL;
-			err = arp_req_get(&r, dev);
-			if (err < 0)
-			{
-				r.arp_flags |= ATF_PUBL;
-				err = arp_req_get(&r, dev);
-			}
-			if (!err)
-				err = copy_to_user(arg, &r, sizeof(struct arpreq_old));
 			return err;
 	}
 	/*NOTREACHED*/