From owner-p4-projects  Mon Apr  1  8:51: 9 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13A3D37B41C; Mon,  1 Apr 2002 08:51:02 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 4FD3937B41A
	for <perforce@freebsd.org>; Mon,  1 Apr 2002 08:51:01 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g31Gp1I83717
	for perforce@freebsd.org; Mon, 1 Apr 2002 08:51:01 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Mon, 1 Apr 2002 08:51:01 -0800 (PST)
Message-Id: <200204011651.g31Gp1I83717@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 8783 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8783

Change 8783 by jhb@jhb_laptop on 2002/04/01 08:50:38

	Minor cleanups to reduce diffs against current a bit in code
	shared with other BSD's.

Affected files ...

... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#8 edit
... //depot/projects/smpng/sys/netinet6/ip6_input.c#9 edit

Differences ...

==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#8 (text+ko) ====

@@ -1242,7 +1242,7 @@
 #if __FreeBSD__ >= 5
 	struct thread *td = curthread;	/* XXX */
 #else
-	struct proc *p = curproc;	/*XXX*/
+	struct proc *td = curproc;	/*XXX*/
 #endif
 
 	s = splnet();
@@ -1335,11 +1335,7 @@
 #if !defined(__FreeBSD__)
 		error = suser(p->p_ucred, &p->p_acflag);
 #else
-#if __FreeBSD__ >= 5
 		error = suser(td);
-#else
-		error = suser(p);
-#endif
 #endif
 		if (error)
 			break;
@@ -1350,12 +1346,8 @@
 #if !defined(__FreeBSD__)
 		error = suser(p->p_ucred, &p->p_acflag);
 #else
-#if __FreeBSD__ >= 5
 		error = suser(td);
-#else
-		error = suser(p);
 #endif
-#endif
 		if (error)
 			break;
 		error = cnw_setkey(sc, (int)ifr->ifr_key);
@@ -1365,11 +1357,7 @@
 #if !defined(__FreeBSD__)
 		error = suser(p->p_ucred, &p->p_acflag);
 #else
-#if __FreeBSD__ >= 5
 		error = suser(td);
-#else
-		error = suser(p);
-#endif
 #endif
 		if (error)
 			break;

==== //depot/projects/smpng/sys/netinet6/ip6_input.c#9 (text+ko) ====

@@ -1135,7 +1135,7 @@
 	struct mbuf *m;
 {
 #if __FreeBSD__ >= 5
-	struct thread *td = curthread;	/* XXX */
+	struct thread *p = curthread;	/* XXX */
 #else
 	struct proc *p = curproc;	/* XXX */
 #endif
@@ -1143,11 +1143,7 @@
 	int rthdr_exist = 0;
 
 
-#if __FreeBSD__ >= 5
-	if (!suser(td))
-#else
 	if (p && !suser(p))
-#endif
  		privileged++;
 
 #ifdef SO_TIMESTAMP

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message