From owner-p4-projects@FreeBSD.ORG  Tue Nov 18 22:29:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1263E1065673; Tue, 18 Nov 2008 22:29:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB1A81065670
	for <perforce@freebsd.org>; Tue, 18 Nov 2008 22:29:21 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B742F8FC18
	for <perforce@freebsd.org>; Tue, 18 Nov 2008 22:29:21 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAIMTLtD075130
	for <perforce@freebsd.org>; Tue, 18 Nov 2008 22:29:21 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAIMTLbv075128
	for perforce@freebsd.org; Tue, 18 Nov 2008 22:29:21 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 18 Nov 2008 22:29:21 GMT
Message-Id: <200811182229.mAIMTLbv075128@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153172 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Nov 2008 22:29:22 -0000

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

Change 153172 by julian@julian_trafmon1 on 2008/11/18 22:28:55

	No problem with tokenring. Re-enable.

Affected files ...

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

Differences ...

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

@@ -609,7 +609,6 @@
 		(void)memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen);
 		la->la_flags |= LLE_VALID;
 
-#if 0 /* Qing - not yet supported */
 		/*
 		 * If we receive an arp from a token-ring station over
 		 * a token-ring nic then try to save the source
@@ -644,7 +643,6 @@
 			m->m_pkthdr.len += 8;
 			th->rcf = trld->trld_rcf;
 		}
-#endif
 
 		if (!(la->la_flags & LLE_STATIC)) {
 			la->la_expire = time_uptime + arpt_keep;