PERFORCE change 142005 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=142005

Change 142005 by julian at julian_trafmon1 on 2008/05/22 00:58:26

	fix slight mismerge parts

Affected files ...

.. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#5 edit

Differences ...

==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#5 (text+ko) ====

@@ -238,7 +238,6 @@
 	struct llentry *la = 0;
 	u_int flags;
 	int error;
-	int fibnum = 0;
 
 	*lle = NULL;
 
@@ -254,7 +253,6 @@
 			ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten);
 			return (0);
 		}
-		fibnum = M_GETFIB(m);
 	}
 	if (!ifp)
 		panic("%s: invalid interface pointer", __func__);
@@ -431,9 +429,6 @@
 */
 	int req_len;
 	int bridged = 0;
-	u_int fibnum;
-	u_int goodfib = 0;
-	int firstpass = 1;
 #ifdef DEV_CARP
 	int carp_match = 0;
 #endif
@@ -548,7 +543,7 @@
 				    la->lle_tbl->llt_ifp->if_xname,
 				    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
 				    ifp->if_xname);
-			continue;
+			goto reply;
 		}
 
 		if (flag & LLE_CREATE)
@@ -642,6 +637,7 @@
 		(void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln);
 		(void)memcpy(ar_sha(ah), enaddr, ah->ar_hln);
 	} else {
+		if (la == NULL) {
 			if (!arp_proxyall)
 				goto drop;