From owner-p4-projects@FreeBSD.ORG  Tue Apr 25 23:28:49 2006
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 3122116A405; Tue, 25 Apr 2006 23:28:49 +0000 (UTC)
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 EC17B16A403
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 23:28:48 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B5AC543D48
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 23:28:48 +0000 (GMT)
	(envelope-from marcel@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 k3PNSmx1056077
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 23:28:48 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3PNSmvI056069
	for perforce@freebsd.org; Tue, 25 Apr 2006 23:28:48 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 25 Apr 2006 23:28:48 GMT
Message-Id: <200604252328.k3PNSmvI056069@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96119 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, 25 Apr 2006 23:28:49 -0000

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

Change 96119 by marcel@marcel_nfs on 2006/04/25 23:28:47

	IFC @96118

Affected files ...

.. //depot/projects/uart/dev/ath/if_ath.c#27 integrate
.. //depot/projects/uart/netinet/in_pcb.c#17 integrate

Differences ...

==== //depot/projects/uart/dev/ath/if_ath.c#27 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.140 2006/04/16 18:24:27 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.141 2006/04/25 22:52:28 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -1949,7 +1949,8 @@
 		 * Switch antenna every 4 beacons.
 		 * XXX assumes two antenna
 		 */
-		antenna = (sc->sc_stats.ast_be_xmit & 4 ? 2 : 1);
+		antenna = sc->sc_txantenna != 0 ? sc->sc_txantenna
+			: (sc->sc_stats.ast_be_xmit & 4 ? 2 : 1);
 	}
 
 	KASSERT(bf->bf_nseg == 1,

==== //depot/projects/uart/netinet/in_pcb.c#17 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.175 2006/04/25 11:17:35 rwatson Exp $
+ * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.176 2006/04/25 23:23:13 marcel Exp $
  */
 
 #include "opt_ipsec.h"
@@ -737,9 +737,8 @@
 void
 in_pcbdrop(struct inpcb *inp)
 {
-	struct inpcbinfo *pcbinfo = inp->inp_pcbinfo;
 
-	INP_INFO_WLOCK_ASSERT(pcbinfo);
+	INP_INFO_WLOCK_ASSERT(inp->inp_pcbinfo);
 	INP_LOCK_ASSERT(inp);
 
 	inp->inp_vflag |= INP_DROPPED;