From owner-p4-projects@FreeBSD.ORG  Wed Jun 15 20:58:54 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 822E716A420; Wed, 15 Jun 2005 20:58:53 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 554F716A41C
	for <perforce@freebsd.org>; Wed, 15 Jun 2005 20:58:53 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E02543D55
	for <perforce@freebsd.org>; Wed, 15 Jun 2005 20:58:53 +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 j5FKwrIL038881
	for <perforce@freebsd.org>; Wed, 15 Jun 2005 20:58:53 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5FKwqgO038878
	for perforce@freebsd.org; Wed, 15 Jun 2005 20:58:52 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 15 Jun 2005 20:58:52 GMT
Message-Id: <200506152058.j5FKwqgO038878@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>
Cc: 
Subject: PERFORCE change 78583 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: Wed, 15 Jun 2005 20:58:54 -0000

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

Change 78583 by jhb@jhb_slimer on 2005/06/15 20:58:09

	IFC @78573.

Affected files ...

.. //depot/projects/smpng/sys/dev/ed/if_ed.c#31 integrate

Differences ...

==== //depot/projects/smpng/sys/dev/ed/if_ed.c#31 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.253 2005/06/10 16:49:06 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.254 2005/06/15 20:23:40 brooks Exp $");
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -616,7 +616,7 @@
 static __inline void
 ed_xmit(struct ed_softc *sc)
 {
-	struct ifnet *ifp = (struct ifnet *)sc;
+	struct ifnet *ifp = sc->ifp;
 	unsigned short len;
 
 	if (sc->gone)
@@ -964,7 +964,7 @@
 edintr(void *arg)
 {
 	struct ed_softc *sc = (struct ed_softc*) arg;
-	struct ifnet *ifp = (struct ifnet *)sc;
+	struct ifnet *ifp = sc->ifp;
 	u_char  isr;
 	int	count;
 
@@ -1479,7 +1479,7 @@
 static u_short
 ed_pio_write_mbufs(struct ed_softc *sc, struct mbuf *m, long dst)
 {
-	struct ifnet *ifp = (struct ifnet *)sc;
+	struct ifnet *ifp = sc->ifp;
 	unsigned short total_len, dma_len;
 	struct mbuf *mp;
 	int     maxwait = 200;	/* about 240us */
@@ -1691,7 +1691,7 @@
 static void
 ed_setrcr(struct ed_softc *sc)
 {
-	struct ifnet *ifp = (struct ifnet *)sc;
+	struct ifnet *ifp = sc->ifp;
 	int     i;
 	u_char	reg1;