PERFORCE change 96119 for review

[Marcel Moolenaar]

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

Change 96119 by marcel at 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;