[Madwifi-cvs] revision 2513 committed
Status: Beta
Brought to you by:
otaku
Menu
▾
▴
[Madwifi-cvs] revision 2513 committed
|
From: Matthew W. S. B. <svn...@ma...> - 2007-06-25 03:48:20
|
Project : madwifi
Revision : 2513
Author : mentor (Matthew W. S. Bell)
Date : 2007-06-25 05:48:07 +0200 (Mon, 25 Jun 2007)
Log Message :
Fix the most gratuitous misuse of apostophes. Boredom level: high.
Affected Files:
* trunk/README updated
* trunk/ath/if_ath.c updated
* trunk/ath/if_ath_pci.c updated
* trunk/ath/if_athvar.h updated
* trunk/ath_rate/amrr/amrr.c updated
* trunk/ath_rate/onoe/onoe.c updated
* trunk/net80211/_ieee80211.h updated
* trunk/net80211/ieee80211.h updated
* trunk/net80211/ieee80211_crypto_ccmp.c updated
* trunk/net80211/ieee80211_crypto_tkip.c updated
* trunk/net80211/ieee80211_input.c updated
* trunk/net80211/ieee80211_ioctl.h updated
* trunk/net80211/ieee80211_linux.c updated
* trunk/net80211/ieee80211_linux.h updated
* trunk/net80211/ieee80211_monitor.c updated
* trunk/net80211/ieee80211_monitor.h updated
* trunk/net80211/ieee80211_node.c updated
* trunk/net80211/ieee80211_node.h updated
* trunk/net80211/ieee80211_output.c updated
* trunk/net80211/ieee80211_power.c updated
* trunk/net80211/ieee80211_proto.c updated
* trunk/net80211/ieee80211_rate.h updated
* trunk/net80211/ieee80211_scan.c updated
* trunk/net80211/ieee80211_scan.h updated
* trunk/net80211/ieee80211_scan_ap.c updated
* trunk/net80211/ieee80211_scan_sta.c updated
* trunk/net80211/ieee80211_var.h updated
* trunk/regression/ccmp/test_ccmp.c updated
* trunk/regression/wep/test_wep.c updated
* trunk/tools/80211debug.c updated
* trunk/tools/athdebug.c updated
* trunk/tools/man/wlanconfig.8 updated
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/README 2007-06-25 03:48:07 UTC (rev 2513)
@@ -176,13 +176,13 @@
An interesting feature of MadWifi is Virtual AP (VAP) mode, which allows
the operation of multiple concurrent (virtual) access points, and
concurrent interfaces running in both AP and station mode. To
-manipulate VAP's, MadWifi comes with a tool called wlanconfig which is
+manipulate VAPs, MadWifi comes with a tool called wlanconfig which is
used to create and destroy VAPS with various different modes.
The following examples assume that the "autocreate=none" option has been
parsed to the module at load time. This allows fine control over
-management of VAP's, as the creation of a Managed mode station should be
-delayed until all other required VAP's are first created, as only one
+management of VAPs, as the creation of a Managed mode station should be
+delayed until all other required VAPs are first created, as only one
sta mode VAP can exist per physical device.
To create an access point, use:
@@ -204,7 +204,7 @@
wlanconfig ath0 destroy
-For more information about Virtual AP's, please refer to the users-guide
+For more information about Virtual APs, please refer to the users-guide
document distributed with the MadWifi source code.
For more information about wlanconfig, see its manpage, it is installed
@@ -273,10 +273,10 @@
together with WPA/WPA2 or without; consult the wpa_supplicant
documentation for an up to date list.
-MadWifi supports the use of the Wireless Extensions ioctl's equal to or
+MadWifi supports the use of the Wireless Extensions ioctls equal to or
greater than WE18 (linux 2.6.15). When using wpa_supplicant with a
recent linux kernel, it is preferred to use the 'wext' driver backend,
-rather than the private MadWifi ioctl's. This means that '-D wext'
+rather than the private MadWifi ioctls. This means that '-D wext'
option should be used with wpa_supplicant when the linux kernel version
is 2.6.15 or above.
Modified: trunk/ath/if_ath.c
===================================================================
--- trunk/ath/if_ath.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/ath/if_ath.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -480,8 +480,8 @@
/*
* Check if the MAC has multi-rate retry support.
* We do this by trying to setup a fake extended
- * descriptor. MAC's that don't have support will
- * return false w/o doing anything. MAC's that do
+ * descriptor. MACs that don't have support will
+ * return false w/o doing anything. MACs that do
* support it will return true w/o doing anything.
*/
sc->sc_mrretry = ath_hal_setupxtxdesc(ah, NULL, 0,0, 0,0, 0,0);
@@ -1069,7 +1069,7 @@
break;
case IEEE80211_M_HOSTAP:
case IEEE80211_M_WDS:
- /* permit multiple ap's and/or wds links */
+ /* permit multiple APs and/or WDS links */
/* XXX sta+ap for repeater/bridge application */
if ((sc->sc_nvaps != 0) && (ic->ic_opmode == IEEE80211_M_STA))
return NULL;
@@ -1088,7 +1088,7 @@
}
if (sc->sc_nvaps >= ATH_BCBUF) {
- printk(KERN_WARNING "too many virtual ap's (already got %d)\n", sc->sc_nvaps);
+ printk(KERN_WARNING "too many virtual APs (already got %d)\n", sc->sc_nvaps);
return NULL;
}
@@ -1132,7 +1132,7 @@
* Hardware supports the bssid mask and a unique
* bssid was requested. Assign a new mac address
* and expand our bssid mask to cover the active
- * virtual ap's with distinct addresses.
+ * virtual APs with distinct addresses.
*/
/* do a full search to mark all the allocated VAPs */
@@ -1212,7 +1212,7 @@
sc->sc_nmonvaps++;
/*
* Adhoc demo mode is a pseudo mode; to the HAL it's
- * just ibss mode and the driver doesn't use management
+ * just IBSS mode and the driver doesn't use management
* frames. Other modes carry over directly to the HAL.
*/
if (ic->ic_opmode == IEEE80211_M_AHDEMO)
@@ -1860,7 +1860,7 @@
}
/*
- * Flush the skb's allocated for receive in case the rx
+ * Flush the skbs allocated for receive in case the rx
* buffer size changes. This could be optimized but for
* now we do it each time under the assumption it does
* not happen often.
@@ -2473,7 +2473,7 @@
* Transmit a data packet. On failure caller is
* assumed to reclaim the resources.
*
- * Context: process context with BH's disabled
+ * Context: process context with BHs disabled
*/
static int
ath_hardstart(struct sk_buff *skb, struct net_device *dev)
@@ -3165,7 +3165,7 @@
* functionality. For those parts the key id must match
* the h/w key index so lookups find the right key. On
* parts w/ the key search facility we install the sender's
- * mac address (with the high bit set) and let the hardware
+ * MAC address (with the high bit set) and let the hardware
* find the key w/o using the key id. This is preferred as
* it permits us to support multiple users for adhoc and/or
* multi-station operation.
@@ -3854,8 +3854,8 @@
uint64_t tuadjust;
__le64 tsfadjust;
/*
- * The beacon interval is in TU's; the TSF in usecs.
- * We figure out how many TU's to add to align the
+ * The beacon interval is in TUs; the TSF in usecs.
+ * We figure out how many TUs to add to align the
* timestamp then convert to TSF units and handle
* byte swapping before writing it in the frame.
* The hardware will then add this each time a beacon
@@ -3926,9 +3926,9 @@
ds->ds_link = 0;
/*
* Switch antenna every beacon if txantenna is not set
- * Should only switch every beacon period, not for every
- * SWBA's
- * XXX assumes two antenna
+ * Should only switch every beacon period, not for all
+ * SWBAs
+ * XXX: assumes two antennae
*/
if (antenna == 0) {
if (sc->sc_stagbeacons)
@@ -4067,7 +4067,7 @@
* 1) if there is only one VAP let the cab traffic continue.
* 2) if there are more than one VAP and we are using staggered
* beacons, then drain the cabq by dropping all the frames in
- * the cabq so that the current VAP's cab traffic can be scheduled.
+ * the cabq so that the current VAPs CAB traffic can be scheduled.
* XXX: Need to handle the last MORE_DATA bit here.
*/
if (ncabq && (avp->av_boff.bo_tim[4] & 1) && sc->sc_cabq->axq_depth) {
@@ -4094,7 +4094,7 @@
struct ath_txq *cabq = sc->sc_cabq;
struct ath_buf *bfmcast;
/*
- * Move everything from the VAP's mcast queue
+ * Move everything from the VAPs mcast queue
* to the hardware cab queue.
*/
ATH_TXQ_LOCK_IRQ(&avp->av_mcastq);
@@ -4437,7 +4437,7 @@
* arrange for the SWBA to be delivered for each slot.
* Slots that are not occupied will generate nothing.
*/
- /* NB: the beacon interval is kept internally in TU's */
+ /* NB: the beacon interval is kept internally in TUs */
intval = ic->ic_lintval & HAL_BEACON_PERIOD;
if (sc->sc_stagbeacons)
intval /= ATH_BCBUF; /* for staggered beacons */
@@ -5412,7 +5412,7 @@
if (sc->sc_nmonvaps > 0) {
/* Pass up tsf clock in mactime
- * TX descriptor contains the transmit time in TU's,
+ * TX descriptor contains the transmit time in TUs,
* (bits 25-10 of the TSF).
*/
tstamp = ts->ts_tstamp << 10;
@@ -5461,11 +5461,11 @@
if (vap->iv_opmode == IEEE80211_M_IBSS &&
vap->iv_state == IEEE80211_S_RUN) {
/*
- * Handle ibss merge as needed; check the tsf on the
+ * Handle IBSS merge as needed; check the TSF on the
* frame before attempting the merge. The 802.11 spec
- * says the station should change it's bssid to match
- * the oldest station with the same ssid, where oldest
- * is determined by the tsf. Note that hardware
+ * says the station should change its BSSID to match
+ * the oldest station with the same SSID, where oldest
+ * is determined by the TSF. Note that hardware
* reconfiguration happens through callback to
* ath_newstate as the state machine will go from
* RUN -> RUN when this happens.
@@ -6313,9 +6313,9 @@
* Setup a hardware data transmit queue for the specified
* access control. The HAL may not support all requested
* queues in which case it will return a reference to a
- * previously setup queue. We record the mapping from ac's
- * to h/w queues for use by ath_tx_start and also track
- * the set of h/w queues being used to optimize work in the
+ * previously setup queue. We record the mapping from ACs
+ * to H/W queues for use by ath_tx_start and also track
+ * the set of H/W queues being used to optimize work in the
* transmit interrupt handler and related routines.
*/
static int
@@ -7673,7 +7673,7 @@
}
/*
- * Flush skb's allocate for receive.
+ * Flush skbs allocated for receiving.
*/
static void
ath_flushrecv(struct ath_softc *sc)
@@ -7928,7 +7928,7 @@
(void) ath_chan_set(sc, ic->ic_curchan);
/*
* If we are returning to our bss channel then mark state
- * so the next recv'd beacon's tsf will be used to sync the
+ * so the next recv'd beacon's TSF will be used to sync the
* beacon timers. Note that since we only hear beacons in
* sta/ibss mode this has no effect in other operating modes.
*/
@@ -8123,7 +8123,7 @@
/* XXX no rate negotiation; just dup */
wds_ni->ni_rates = vap->iv_bss->ni_rates;
/* Depending on the sequence of bringing up devices
- * it's possible the rates of the root bss isn't
+ * it's possible the rates of the root BSS isn't
* filled yet. */
if ((vap->iv_ic->ic_newassoc != NULL) &&
(wds_ni->ni_rates.rs_nrates != 0)) {
@@ -8675,7 +8675,7 @@
ath_hal_settxpowlimit(ah, txpowlimit);
/*
- * Make sure the VAP's change is within limits, clamp it otherwise
+ * Make sure the VAPs change is within limits, clamp it otherwise
*/
if (ic->ic_newtxpowlimit > ic->ic_txpowlimit)
clamped_txpow = ic->ic_txpowlimit;
Modified: trunk/ath/if_ath_pci.c
===================================================================
--- trunk/ath/if_ath_pci.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/ath/if_ath_pci.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -81,7 +81,7 @@
};
/*
- * User a static table of PCI id's for now. While this is the
+ * User a static table of PCI IDs for now. While this is the
* "new way" to do things, we may want to switch back to having
* the HAL check them by defining a probe method.
*/
Modified: trunk/ath/if_athvar.h
===================================================================
--- trunk/ath/if_athvar.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/ath/if_athvar.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -596,9 +596,9 @@
u_int8_t sc_protrix; /* protection rate index */
u_int8_t sc_mcastantenna; /* Multicast antenna number */
u_int8_t sc_txantenna; /* data tx antenna (fixed or auto) */
- u_int16_t sc_nvaps; /* # of active virtual ap's */
- u_int8_t sc_nstavaps; /* # of active station vaps */
- u_int8_t sc_nmonvaps; /* # of monitor vaps */
+ u_int16_t sc_nvaps; /* # of active virtual APs */
+ u_int8_t sc_nstavaps; /* # of active station VAPs */
+ u_int8_t sc_nmonvaps; /* # of monitor VAPs */
u_int8_t sc_nbcnvaps; /* # of vaps sending beacons */
u_int sc_fftxqmin; /* aggregation threshold */
HAL_INT sc_imask; /* interrupt mask copy */
@@ -628,7 +628,7 @@
struct ATH_TQ_STRUCT sc_rxtq; /* rx intr tasklet */
struct ATH_TQ_STRUCT sc_rxorntq; /* rxorn intr tasklet */
u_int8_t sc_defant; /* current default antenna */
- u_int8_t sc_rxotherant; /* rx's on non-default antenna*/
+ u_int8_t sc_rxotherant; /* RXs on non-default antenna */
u_int16_t sc_cachelsz; /* cache line size */
struct ath_descdma sc_txdma; /* TX descriptors */
Modified: trunk/ath_rate/amrr/amrr.c
===================================================================
--- trunk/ath_rate/amrr/amrr.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/ath_rate/amrr/amrr.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -336,7 +336,7 @@
} else {
/*
* When operating as a station the node table holds
- * the AP's that were discovered during scanning.
+ * the APs that were discovered during scanning.
* For any other operating mode we want to reset the
* tx rate state of each node.
*/
Modified: trunk/ath_rate/onoe/onoe.c
===================================================================
--- trunk/ath_rate/onoe/onoe.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/ath_rate/onoe/onoe.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -320,7 +320,7 @@
} else {
/*
* When operating as a station the node table holds
- * the AP's that were discovered during scanning.
+ * the APs that were discovered during scanning.
* For any other operating mode we want to reset the
* tx rate state of each node.
*/
Modified: trunk/net80211/_ieee80211.h
===================================================================
--- trunk/net80211/_ieee80211.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/_ieee80211.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -42,7 +42,7 @@
};
#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */
-/* XXX not really a mode; there are really multiple PHY's */
+/* XXX: not really a mode; there are really multiple PHYs */
enum ieee80211_phymode {
IEEE80211_MODE_AUTO = 0, /* autoselect */
IEEE80211_MODE_11A = 1, /* 5GHz, OFDM */
Modified: trunk/net80211/ieee80211.h
===================================================================
--- trunk/net80211/ieee80211.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -909,7 +909,7 @@
/*
* The 802.11 spec says at most 2007 stations may be
- * associated at once. For most AP's this is way more
+ * associated at once. For most APs this is way more
* than is feasible so we use a default of 128. This
* number may be overridden by the driver and/or by
* user configuration.
Modified: trunk/net80211/ieee80211_crypto_ccmp.c
===================================================================
--- trunk/net80211/ieee80211_crypto_ccmp.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_crypto_ccmp.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -36,7 +36,7 @@
*
* Part of this module is derived from similar code in the Host
* AP driver. The code is used with the consent of the author and
- * it's license is included below.
+ * its license is included below.
*/
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
Modified: trunk/net80211/ieee80211_crypto_tkip.c
===================================================================
--- trunk/net80211/ieee80211_crypto_tkip.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_crypto_tkip.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -36,7 +36,7 @@
*
* Part of this module is derived from similar code in the Host
* AP driver. The code is used with the consent of the author and
- * it's license is included below.
+ * its license is included below.
*/
#ifndef AUTOCONF_INCLUDED
#include <linux/config.h>
Modified: trunk/net80211/ieee80211_input.c
===================================================================
--- trunk/net80211/ieee80211_input.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_input.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -3164,7 +3164,7 @@
case IEEE80211_ELEMID_XRATES:
xrates = frm;
break;
- /* XXX verify only one of RSN and WPA ie's? */
+ /* XXX verify only one of RSN and WPA IEs? */
case IEEE80211_ELEMID_RSN:
if (vap->iv_flags & IEEE80211_F_WPA2)
rsn = frm;
Modified: trunk/net80211/ieee80211_ioctl.h
===================================================================
--- trunk/net80211/ieee80211_ioctl.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_ioctl.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -250,7 +250,7 @@
* MAC ACL operations.
*/
enum {
- IEEE80211_MACCMD_POLICY_OPEN = 0, /* set policy: no ACL's */
+ IEEE80211_MACCMD_POLICY_OPEN = 0, /* set policy: no ACLs */
IEEE80211_MACCMD_POLICY_ALLOW = 1, /* set policy: allow traffic */
IEEE80211_MACCMD_POLICY_DENY = 2, /* set policy: deny traffic */
IEEE80211_MACCMD_FLUSH = 3, /* flush ACL database */
Modified: trunk/net80211/ieee80211_linux.c
===================================================================
--- trunk/net80211/ieee80211_linux.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_linux.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -113,7 +113,7 @@
#if 0
/*
- * Drain a queue of sk_buff's.
+ * Drain a queue of sk_buffs.
*/
void
__skb_queue_drain(struct sk_buff_head *q)
Modified: trunk/net80211/ieee80211_linux.h
===================================================================
--- trunk/net80211/ieee80211_linux.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_linux.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -296,7 +296,7 @@
* held in the sk_buff control buffer. This is used to
* communicate various inter-procedural state that needs
* to be associated with the frame for the duration of
- * it's existence.
+ * its existence.
*
* NB: sizeof(cb) == 48 and the vlan code grabs the first
* 8 bytes so we reserve/avoid it.
Modified: trunk/net80211/ieee80211_monitor.c
===================================================================
--- trunk/net80211/ieee80211_monitor.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_monitor.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -49,7 +49,7 @@
#include <net/iw_handler.h>
#include <linux/wireless.h>
-#include <linux/if_arp.h> /* XXX for ARPHRD_* */
+#include <linux/if_arp.h> /* for ARPHRD_* */
#include <asm/uaccess.h>
@@ -349,7 +349,7 @@
pkttype = PACKET_HOST;
} else {
/*
- * The frame passed it's CRC, so we can rely
+ * The frame passed its CRC, so we can rely
* on the contents of the frame to set pkttype.
*/
if (tx)
Modified: trunk/net80211/ieee80211_monitor.h
===================================================================
--- trunk/net80211/ieee80211_monitor.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_monitor.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -149,7 +149,7 @@
}__attribute__((__packed__));
/*
- * Dispatch an skb to monitor-mode vap's. The skb is assumed
+ * Dispatch an skb to monitor-mode VAPs. The skb is assumed
* to have space at the front to push a wlan_ng_prims2_header.
*/
void ieee80211_input_monitor(struct ieee80211com *, struct sk_buff *,
Modified: trunk/net80211/ieee80211_node.c
===================================================================
--- trunk/net80211/ieee80211_node.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_node.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -54,7 +54,7 @@
#include <net80211/if_athproto.h>
/*
- * Association id's are managed with a bit vector.
+ * Association IDs are managed with a bit vector.
*/
#define IEEE80211_AID_SET(_vap, _b) \
((_vap)->iv_aid_bitmap[IEEE80211_AID(_b) / 32] |= \
@@ -505,7 +505,7 @@
* has the station's desired SSID. The "oldest" 802.11 network
* sends beacons with the greatest TSF timestamp.
*
- * The caller is assumed to validate TSF's before attempting a merge.
+ * The caller is assumed to validate TSFs before attempting a merge.
*
* Return !0 if the BSSID changed, 0 otherwise.
*/
@@ -785,7 +785,7 @@
vap->iv_ps_sta--;
ni->ni_flags &= ~IEEE80211_NODE_PWR_MGT;
IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
- "power save mode off, %u sta's in ps mode",
+ "power save mode off, %u STAs in PS mode",
vap->iv_ps_sta);
if (ni->ni_flags & IEEE80211_NODE_UAPSD_TRIG) {
@@ -805,7 +805,7 @@
ni->ni_associd = 0;
/*
- * Preserve SSID, WPA, and WME ie's so the bss node is
+ * Preserve SSID, WPA, and WME IEs so the bss node is
* reusable during a re-auth/re-assoc state transition.
* If we remove these data they will not be recreated
* because they come from a probe-response or beacon frame
@@ -1149,7 +1149,7 @@
* Fake up a node; this handles node discovery in adhoc mode.
* Note that for the driver's benefit we we treat this like
* an association so the driver has an opportunity to setup
- * it's private state.
+ * its private state.
*
* Caller must ieee80211_ref_node()
*/
@@ -1179,7 +1179,7 @@
* Do node discovery in adhoc mode on receipt of a beacon
* or probe response frame. Note that for the driver's
* benefit we treat this like an association so the
- * driver has an opportunity to setup it's private state.
+ * driver has an opportunity to setup its private state.
*/
struct ieee80211_node *
ieee80211_add_neighbor(struct ieee80211vap *vap, const struct ieee80211_frame *wh,
@@ -1221,7 +1221,7 @@
/*
* Blindly propagate capabilities based on the
* local configuration. In particular this permits
- * us to use QoS to disable ACK's and to use short
+ * us to use QoS to disable ACKs and to use short
* preamble on 2.4G channels.
*/
if (vap->iv_flags & IEEE80211_F_WME)
@@ -1649,7 +1649,7 @@
IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
"station needs long slot time, count %d",
ic->ic_longslotsta);
- /* XXX vap's w/ conflicting needs won't work */
+ /* XXX VAPs w/ conflicting needs won't work */
if (!IEEE80211_IS_CHAN_108G(ic->ic_bsschan)) {
/*
* Don't force slot time when switched to turbo
@@ -1875,7 +1875,7 @@
* Tell the authenticator the station is leaving.
* Note that we must do this before yanking the
* association id as the authenticator uses the
- * associd to locate it's state block.
+ * associd to locate its state block.
*/
if (vap->iv_auth->ia_node_leave != NULL)
vap->iv_auth->ia_node_leave(ni);
Modified: trunk/net80211/ieee80211_node.h
===================================================================
--- trunk/net80211/ieee80211_node.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_node.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -45,7 +45,7 @@
* (waiting for a response to a management frame when operating
* as a station), and node inactivity processing (when operating
* as an AP). For inactivity processing each node has a timeout
- * set in it's ni_inact field that is decremented on each timeout
+ * set in its ni_inact field that is decremented on each timeout
* and the node is reclaimed when the counter goes to zero. We
* use different inactivity timeout values depending on whether
* the node is associated and authorized (either by 802.1x or
Modified: trunk/net80211/ieee80211_output.c
===================================================================
--- trunk/net80211/ieee80211_output.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_output.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -195,7 +195,7 @@
}
/*
- * Context: process context (BH's disabled)
+ * Context: process context (BHs disabled)
*/
int
ieee80211_hardstart(struct sk_buff *skb, struct net_device *dev)
@@ -264,7 +264,7 @@
} else if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT)) {
/*
* Station in power save mode; stick the frame
- * on the sta's power save queue and continue.
+ * on the STA's power save queue and continue.
* We'll get the frame back when the time is right.
*/
ieee80211_pwrsave(ni, skb);
@@ -1718,7 +1718,7 @@
* [tlv] ssid
* [tlv] supported rates
* [tlv] extended supported rates
- * [tlv] user-specified ie's
+ * [tlv] user-specified IEs
*/
skb = ieee80211_getmgtframe(&frm, 2 + IEEE80211_NWID_LEN +
2 + IEEE80211_RATE_SIZE +
@@ -2033,7 +2033,7 @@
* [tlv] extended supported rates
* [tlv] WME [if enabled and AP capable]
* [tlv] Atheros advanced capabilities
- * [tlv] user-specified ie's
+ * [tlv] user-specified IEs
*/
skb = ieee80211_getmgtframe(&frm,
sizeof(u_int16_t) +
@@ -2058,7 +2058,7 @@
if (vap->iv_flags & IEEE80211_F_PRIVACY)
capinfo |= IEEE80211_CAPINFO_PRIVACY;
/*
- * NB: Some 11a AP's reject the request when
+ * NB: Some 11a APs reject the request when
* short premable is set.
*/
/* Capability information */
Modified: trunk/net80211/ieee80211_power.c
===================================================================
--- trunk/net80211/ieee80211_power.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_power.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -228,7 +228,7 @@
}
/*
- * Tag the frame with it's expiry time and insert
+ * Tag the frame with its expiry time and insert
* it in the queue. The aging interval is 4 times
* the listen interval specified by the station.
* Frames that sit around too long are reclaimed
@@ -270,14 +270,15 @@
vap->iv_ps_sta++;
ni->ni_flags |= IEEE80211_NODE_PWR_MGT;
IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
- "power save mode on, %u sta's in ps mode",
+ "power save mode on, %u STAs in PS mode",
vap->iv_ps_sta);
} else {
if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT))
vap->iv_ps_sta--;
ni->ni_flags &= ~IEEE80211_NODE_PWR_MGT;
IEEE80211_NOTE(vap, IEEE80211_MSG_POWER, ni,
- "power save mode off, %u sta's in ps mode", vap->iv_ps_sta);
+ "power save mode off, %u STAs in PS mode",
+ vap->iv_ps_sta);
/* XXX if no stations in ps mode, flush mc frames */
/*
Modified: trunk/net80211/ieee80211_proto.c
===================================================================
--- trunk/net80211/ieee80211_proto.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_proto.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -1005,7 +1005,7 @@
}
/*
- * Start all runnable vap's on a device.
+ * Start all runnable VAPs on a device.
*/
void
ieee80211_start_running(struct ieee80211com *ic)
@@ -1024,7 +1024,7 @@
/*
* Stop a vap. We force it down using the state machine
- * then mark it's device not running. If this is the last
+ * then mark its device not running. If this is the last
* vap running on the underlying device then we close it
* too to ensure it will be properly initialized when the
* next vap is brought up.
@@ -1062,7 +1062,7 @@
EXPORT_SYMBOL(ieee80211_stop);
/*
- * Stop all vap's running on a device.
+ * Stop all VAPs running on a device.
*/
void
ieee80211_stop_running(struct ieee80211com *ic)
@@ -1628,7 +1628,7 @@
vap->iv_flags_ext |= IEEE80211_FEXT_SCAN_PENDING;
}
} else {
- /* the VAP is forced to scan, we need to change all other vap's state
+ /* the VAP is forced to scan, we need to change all other VAPs state
* to INIT and pend for the scan completion */
TAILQ_FOREACH(tmpvap, &ic->ic_vaps, iv_next) {
if (vap != tmpvap && tmpvap->iv_state != IEEE80211_S_INIT) {
Modified: trunk/net80211/ieee80211_rate.h
===================================================================
--- trunk/net80211/ieee80211_rate.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_rate.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -58,7 +58,7 @@
* rate for each outgoing frame and provided status from each transmitted
* frame. Any ancillary processing is the responsibility of the module
* (e.g. if periodic processing is required then the module should setup
- * it's own timer).
+ * its own timer).
*
* In addition to the transmit rate for each frame the module must also
* indicate the number of attempts to make at the specified rate. If this
Modified: trunk/net80211/ieee80211_scan.c
===================================================================
--- trunk/net80211/ieee80211_scan.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_scan.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -73,7 +73,7 @@
/*
* Amount of time to go off-channel during a background
* scan. This value should be large enough to catch most
- * ap's but short enough that we can return on-channel
+ * APs but short enough that we can return on-channel
* before our listen interval expires.
*
* XXX tunable
Modified: trunk/net80211/ieee80211_scan.h
===================================================================
--- trunk/net80211/ieee80211_scan.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_scan.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -56,9 +56,9 @@
#define IEEE80211_SCAN_ONCE 0x0010 /* do one complete pass */
#define IEEE80211_SCAN_GOTPICK 0x1000 /* got candidate, can stop */
- u_int8_t ss_nssid; /* # ssid's to probe/match */
+ u_int8_t ss_nssid; /* # SSIDs to probe/match */
struct ieee80211_scan_ssid ss_ssid[IEEE80211_SCAN_MAX_SSID];
- /* ssid's to probe/match */
+ /* SSIDs to probe/match */
/* ordered channel set */
struct ieee80211_channel *ss_chans[IEEE80211_SCAN_MAX];
u_int16_t ss_next; /* ix of next chan to scan */
Modified: trunk/net80211/ieee80211_scan_ap.c
===================================================================
--- trunk/net80211/ieee80211_scan_ap.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_scan_ap.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -259,7 +259,7 @@
chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
/* XXX better quantification of channel use? */
- /* XXX count bss's? */
+ /* XXX: count BSSs? */
if (rssi > as->as_maxrssi[chan])
as->as_maxrssi[chan] = rssi;
/* XXX interference, turbo requirements */
@@ -337,7 +337,7 @@
} else {
struct ieee80211_channel *c;
struct ieee80211_scan_entry se;
- /* XXX notify all vap's? */
+ /* XXX: notify all VAPs? */
/* if this is a dynamic turbo frequency , start with normal mode first */
c = ss->ss_chans[bestchanix];
Modified: trunk/net80211/ieee80211_scan_sta.c
===================================================================
--- trunk/net80211/ieee80211_scan_sta.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_scan_sta.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -901,7 +901,7 @@
* If nothing suitable was found decrement
* the failure counts so entries will be
* reconsidered the next time around. We
- * really want to do this only for sta's
+ * really want to do this only for STAs
* where we've previously had some success.
*/
sta_dec_fails(st);
@@ -1333,7 +1333,7 @@
* If nothing suitable was found decrement
* the failure counts so entries will be
* reconsidered the next time around. We
- * really want to do this only for sta's
+ * really want to do this only for STAs
* where we've previously had some success.
*/
sta_dec_fails(st);
@@ -1447,7 +1447,7 @@
* If nothing suitable was found decrement
* the failure counts so entries will be
* reconsidered the next time around. We
- * really want to do this only for sta's
+ * really want to do this only for STAs
* where we've previously had some success.
*/
sta_dec_fails(st);
Modified: trunk/net80211/ieee80211_var.h
===================================================================
--- trunk/net80211/ieee80211_var.h 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/net80211/ieee80211_var.h 2007-06-25 03:48:07 UTC (rev 2513)
@@ -90,7 +90,7 @@
#define IEEE80211_FIXED_RATE_NONE -1
-#define IEEE80211_SWBMISS_THRESHOLD 10 /* software beacon miss threshold, in TU's */
+#define IEEE80211_SWBMISS_THRESHOLD 10 /* software beacon miss threshold, in TUs */
#define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
#define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000)
@@ -104,14 +104,14 @@
(ic)->ic_bsschan->ic_maxregpower - (ic)->ic_curchanmaxpwr : 0)
/* 802.11 control state is split into a common portion that maps
- * 1-1 to a physical device and one or more "Virtual AP's" (VAP)
+ * 1-1 to a physical device and one or more "Virtual APs" (VAP)
* that are bound to an ieee80211com instance and share a single
* underlying device. Each VAP has a corresponding OS device
* entity through which traffic flows and that applications use
* for issuing ioctls, etc.
*/
-/* Data common to one or more virtual AP's. State shared by
+/* Data common to one or more virtual APs. State shared by
* the underlying device and the net80211 layer is exposed here;
* e.g. device-specific callbacks.
*/
@@ -199,7 +199,7 @@
u_int16_t iv_max_aid;
u_int16_t iv_sta_assoc; /* stations associated */
u_int16_t iv_ps_sta; /* stations in power save */
- u_int16_t iv_ps_pending; /* ps sta's w/ pending frames */
+ u_int16_t iv_ps_pending; /* PS STAs w/ pending frames */
u_int8_t *iv_tim_bitmap; /* power-save stations w/ data*/
u_int16_t iv_tim_len; /* ic_tim_bitmap size (bytes) */
u_int8_t iv_dtim_period; /* DTIM period */
@@ -215,7 +215,7 @@
u_int16_t iv_txmax; /* max tx retry count */
u_int16_t iv_txlifetime; /* tx lifetime */
int iv_inact_timer; /* inactivity timer wait */
- void *iv_opt_ie; /* user-specified IE's */
+ void *iv_opt_ie; /* user-specified IEs */
u_int16_t iv_opt_ie_len; /* length of ni_opt_ie */
ieee80211_keyix_t iv_def_txkey; /* default/group TX key index */
struct ieee80211_key iv_nw_keys[IEEE80211_WEP_NKID];
@@ -272,9 +272,9 @@
u_int32_t ic_flags_ext; /* extension of state flags */
u_int32_t ic_caps; /* capabilities */
u_int8_t ic_ath_cap; /* Atheros adv. capabilities */
- u_int8_t ic_promisc; /* vap's needing promisc mode */
- u_int8_t ic_allmulti; /* vap's needing all multicast*/
- u_int8_t ic_nopened; /* vap's been opened */
+ u_int8_t ic_promisc; /* VAPs needing promisc mode */
+ u_int8_t ic_allmulti; /* VAPs needing all multicast*/
+ u_int8_t ic_nopened; /* VAPs been opened */
struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
struct ieee80211_rateset ic_sup_xr_rates;
struct ieee80211_rateset ic_sup_half_rates;
@@ -442,7 +442,7 @@
#define IEEE80211_F_ALLMULTI 0x00000008 /* STATUS: all multicast mode */
/* NB: this is intentionally setup to be IEEE80211_CAPINFO_PRIVACY */
#define IEEE80211_F_PRIVACY 0x00000010 /* CONF: privacy enabled */
-#define IEEE80211_F_PUREG 0x00000020 /* CONF: 11g w/o 11b sta's */
+#define IEEE80211_F_PUREG 0x00000020 /* CONF: 11g w/o 11b STAs */
#define IEEE80211_F_XRUPDATE 0x00000040 /* CONF: update beacon XR element*/
#define IEEE80211_F_SCAN 0x00000080 /* STATUS: scanning */
#define IEEE80211_F_XR 0x00000100 /* CONF: operate in XR mode */
Modified: trunk/regression/ccmp/test_ccmp.c
===================================================================
--- trunk/regression/ccmp/test_ccmp.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/regression/ccmp/test_ccmp.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -41,7 +41,7 @@
* module. It should automatically run all test cases and print
* information for each. To run one or more tests you can specify a
* tests parameter to the module that is a bit mask of the set of tests
- * you want; e.g. insmod ccmp_test tests=7 will run only test mpdu's
+ * you want; e.g. insmod ccmp_test tests=7 will run only test MPDUs
* 1, 2, and 3.
*/
#ifndef AUTOCONF_INCLUDED
Modified: trunk/regression/wep/test_wep.c
===================================================================
--- trunk/regression/wep/test_wep.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/regression/wep/test_wep.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -41,7 +41,7 @@
* module. It should automatically run all test cases and print
* information for each. To run one or more tests you can specify a
* tests parameter to the module that is a bit mask of the set of tests
- * you want; e.g. insmod wep_test tests=7 will run only test mpdu's
+ * you want; e.g. insmod wep_test tests=7 will run only test MPDUs
* 1, 2, and 3.
*/
#ifndef AUTOCONF_INCLUDED
Modified: trunk/tools/80211debug.c
===================================================================
--- trunk/tools/80211debug.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/tools/80211debug.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -163,7 +163,7 @@
fd = fopen(path, "r");
if (fd == NULL)
return -1;
- /* XXX only handle int's */
+ /* XXX: only handle ints */
if (fscanf(fd, "%u", (int *) oldp) != 1) {
fclose(fd);
return -1;
@@ -172,7 +172,7 @@
fd = fopen(path, "w");
if (fd == NULL)
return -1;
- /* XXX only handle int's */
+ /* XXX: only handle ints */
(void) fprintf(fd, "%u", *(int *)newp);
}
fclose(fd);
Modified: trunk/tools/athdebug.c
===================================================================
--- trunk/tools/athdebug.c 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/tools/athdebug.c 2007-06-25 03:48:07 UTC (rev 2513)
@@ -162,7 +162,7 @@
fd = fopen(path, "r");
if (fd == NULL)
return -1;
- /* XXX only handle int's */
+ /* XXX: only handle ints */
if (fscanf(fd, "%u", (int *) oldp) != 1) {
fclose(fd);
return -1;
@@ -171,7 +171,7 @@
fd = fopen(path, "w");
if (fd == NULL)
return -1;
- /* XXX only handle int's */
+ /* XXX: only handle ints */
(void) fprintf(fd, "%u", *(int *)newp);
}
fclose(fd);
Modified: trunk/tools/man/wlanconfig.8
===================================================================
--- trunk/tools/man/wlanconfig.8 2007-06-23 17:40:36 UTC (rev 2512)
+++ trunk/tools/man/wlanconfig.8 2007-06-25 03:48:07 UTC (rev 2513)
@@ -8,7 +8,7 @@
.TP
\fBwlanconfig <vap> list <list item>
.SH "DESCRIPTION"
-The current MadWifi driver supports multiple AP's and concurrent AP/Station
+The current MadWifi driver supports multiple APs and concurrent AP/Station
mode operation on the same device. The devices are restricted to using the
same underlying hardware, thus are limited to coexisting on the same channel
and using the same physical layer features. Each instance of an AP or station
|