From owner-p4-projects@FreeBSD.ORG  Fri Jul 15 16:29:59 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 76A2E16A45D; Fri, 15 Jul 2005 16:29:58 +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 1B6F416A42D
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 16:29:58 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD26843D46
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 16:29:57 +0000 (GMT)
	(envelope-from sam@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 j6FGTv27007162
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 16:29:57 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FGTvrp007158
	for perforce@freebsd.org; Fri, 15 Jul 2005 16:29:57 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 15 Jul 2005 16:29:57 GMT
Message-Id: <200507151629.j6FGTvrp007158@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80277 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: Fri, 15 Jul 2005 16:29:59 -0000

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

Change 80277 by sam@sam_ebb on 2005/07/15 16:29:56

	misc fixups after ifc

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#4 edit
.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#6 edit
.. //depot/projects/wifi/sys/dev/wi/if_wi.c#16 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#4 (text+ko) ====

@@ -814,6 +814,7 @@
 
 	case IEEE80211_M_AHDEMO:
 	case IEEE80211_M_HOSTAP:
+	case IEEE80211_M_WDS:
 		/* should not get there */
 		break;
 	}
@@ -1830,6 +1831,7 @@
 	switch (ic->ic_opmode) {
 	case IEEE80211_M_STA:
 	case IEEE80211_M_HOSTAP:
+	case IEEE80211_M_WDS:		/* XXX */
 		data = htole32(IPW_MODE_BSS);
 		break;
 

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#6 (text+ko) ====

@@ -874,6 +874,7 @@
 
 	case IEEE80211_M_AHDEMO:
 	case IEEE80211_M_HOSTAP:
+	case IEEE80211_M_WDS:
 		/* should not get there */
 		break;
 	}

==== //depot/projects/wifi/sys/dev/wi/if_wi.c#16 (text+ko) ====

@@ -695,6 +695,9 @@
 			wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_ADHOC);
 		wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0);
 		break;
+	case IEEE80211_M_WDS:
+		/* XXXX */
+		break;
 	}
 
 	/* Intersil interprets this RID as joining ESS even in IBSS mode */
@@ -1301,6 +1304,9 @@
 	case IEEE80211_M_MONITOR:
 		imr->ifm_active |= IFM_IEEE80211_MONITOR;
 		break;
+	case IEEE80211_M_WDS:
+		/* XXXX */
+		break;
 	}
 }
 
@@ -2867,8 +2873,11 @@
 static void
 wi_dump_pkt(struct wi_frame *wh, struct ieee80211_node *ni, int rssi)
 {
-	ieee80211_dump_pkt((u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr),
-	    ni ? ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL : -1, rssi);
+	if (ni != NULL)
+		ieee80211_dump_pkt(ni->ni_ic,
+		    (u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr),
+		    ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL,
+		    rssi);
 	printf(" status 0x%x rx_tstamp1 %u rx_tstamp0 0x%u rx_silence %u\n",
 		le16toh(wh->wi_status), le16toh(wh->wi_rx_tstamp1),
 		le16toh(wh->wi_rx_tstamp0), wh->wi_rx_silence);