PERFORCE change 80277 for review
Sam Leffler
sam at FreeBSD.org
Fri Jul 15 16:29:59 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=80277
Change 80277 by sam at 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);
More information about the p4-projects
mailing list