From owner-p4-projects@FreeBSD.ORG  Mon Feb  7 19:57:43 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87CAE16A4D0; Mon,  7 Feb 2005 19:57:43 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D33716A4CE
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 19:57:43 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3162D43D2D
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 19:57:43 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17JvhGh035065
	for <perforce@freebsd.org>; Mon, 7 Feb 2005 19:57:43 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17JvgVx035062
	for perforce@freebsd.org; Mon, 7 Feb 2005 19:57:42 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 7 Feb 2005 19:57:42 GMT
Message-Id: <200502071957.j17JvgVx035062@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 70541 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 07 Feb 2005 19:57:44 -0000

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

Change 70541 by jhb@jhb_slimer on 2005/02/07 19:57:37

	IFC @70539.

Affected files ...

.. //depot/projects/smpng/sys/dev/vge/if_vge.c#4 integrate

Differences ...

==== //depot/projects/smpng/sys/dev/vge/if_vge.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.4 2005/01/06 01:43:31 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/vge/if_vge.c,v 1.5 2005/02/07 19:39:29 glebius Exp $");
 
 /*
  * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -97,7 +97,6 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
-#include <net/route.h>
 
 #include <net/bpf.h>
 
@@ -1570,19 +1569,15 @@
 	if (sc->vge_link) {
 		if (!(mii->mii_media_status & IFM_ACTIVE)) {
 			sc->vge_link = 0;
-#ifdef LINK_STATE_UP
-			sc->arpcom.ac_if.if_link_state = LINK_STATE_UP;
-			rt_ifmsg(&(sc->arpcom.ac_if));
-#endif /* LINK_STATE_UP */
+			if_link_state_change(&sc->arpcom.ac_if,
+			    LINK_STATE_UP);
 		}
 	} else {
 		if (mii->mii_media_status & IFM_ACTIVE &&
 		    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
 			sc->vge_link = 1;
-#ifdef LINK_STATE_DOWN
-			sc->arpcom.ac_if.if_link_state = LINK_STATE_DOWN;
-			rt_ifmsg(&(sc->arpcom.ac_if));
-#endif /* LINK_STATE_DOWN */
+			if_link_state_change(&sc->arpcom.ac_if,
+			    LINK_STATE_DOWN);
 #if __FreeBSD_version < 502114
 			if (ifp->if_snd.ifq_head != NULL)
 #else