Page MenuHomeFreeBSD
Files F169281173

D3595.id8570.diff
No OneTemporary
Actions

D3595.id8570.diff
View Options

Index: sys/net80211/ieee80211.h
===================================================================
--- sys/net80211/ieee80211.h
+++ sys/net80211/ieee80211.h
@@ -51,7 +51,7 @@
uint16_t i_crc;
} __packed;
-#define IEEE80211_PLCP_SFD 0xF3A0
+#define IEEE80211_PLCP_SFD 0xF3A0
#define IEEE80211_PLCP_SERVICE 0x00
#define IEEE80211_PLCP_SERVICE_LOCKED 0x04
#define IEEE80211_PLCL_SERVICE_PBCC 0x08
@@ -327,8 +327,8 @@
#define MNF_SETUP_RESP 1
#define MNF_TEARDOWN 2
-/*
- * 802.11n Management Action Frames
+/*
+ * 802.11n Management Action Frames
*/
/* generic frame format */
struct ieee80211_action {
@@ -352,7 +352,7 @@
/* HT - recommended transmission channel width */
struct ieee80211_action_ht_txchwidth {
struct ieee80211_action at_header;
- uint8_t at_chwidth;
+ uint8_t at_chwidth;
} __packed;
#define IEEE80211_A_HT_TXCHWIDTH_20 0
@@ -413,7 +413,7 @@
struct ieee80211_action rs_header;
uint8_t rs_dialogtoken;
uint16_t rs_statuscode;
- uint16_t rs_baparamset;
+ uint16_t rs_baparamset;
uint16_t rs_batimeout; /* in TUs */
} __packed;
@@ -558,7 +558,7 @@
/*
* 802.11n HT Capability IE
- * NB: these reflect D1.10
+ * NB: these reflect D1.10
*/
struct ieee80211_ie_htcap {
uint8_t hc_id; /* element ID */
@@ -657,7 +657,7 @@
#define IEEE80211_HTINFO_2NDCHAN_NONE 0x00 /* no secondary/ext channel */
#define IEEE80211_HTINFO_2NDCHAN_ABOVE 0x01 /* above private channel */
/* NB: 2 is reserved */
-#define IEEE80211_HTINFO_2NDCHAN_BELOW 0x03 /* below primary channel */
+#define IEEE80211_HTINFO_2NDCHAN_BELOW 0x03 /* below primary channel */
#define IEEE80211_HTINFO_TXWIDTH 0x04 /* tx channel width */
#define IEEE80211_HTINFO_TXWIDTH_20 0x00 /* 20MHz width */
#define IEEE80211_HTINFO_TXWIDTH_2040 0x04 /* any supported width */
@@ -1048,7 +1048,7 @@
#define IEEE80211_AID(b) ((b) &~ 0xc000)
-/*
+/*
* RTS frame length parameters. The default is specified in
* the 802.11 spec as 512; we treat it as implementation-dependent
* so it's defined in ieee80211_var.h. The max may be wrong
@@ -1057,7 +1057,7 @@
#define IEEE80211_RTS_MIN 1
#define IEEE80211_RTS_MAX 2346
-/*
+/*
* TX fragmentation parameters. As above for RTS, we treat
* default as implementation-dependent so define it elsewhere.
*/
Index: sys/net80211/ieee80211.c
===================================================================
--- sys/net80211/ieee80211.c
+++ sys/net80211/ieee80211.c
@@ -246,14 +246,14 @@
int
ic_printf(struct ieee80211com *ic, const char * fmt, ...)
-{
+{
va_list ap;
int retval;
retval = printf("%s: ", ic->ic_name);
va_start(ap, fmt);
retval += vprintf(fmt, ap);
- va_end(ap);
+ va_end(ap);
return (retval);
}
@@ -618,7 +618,7 @@
return 1;
}
-/*
+/*
* Tear down vap state and reclaim the ifnet.
* The driver is assumed to have prepared for
* this; e.g. by turning off interrupts for the
@@ -1101,7 +1101,7 @@
#define ADD(_ic, _s, _o) \
ifmedia_add(media, \
IFM_MAKEWORD(IFM_IEEE80211, (_s), (_o), 0), 0, NULL)
- static const u_int mopts[IEEE80211_MODE_MAX] = {
+ static const u_int mopts[IEEE80211_MODE_MAX] = {
[IEEE80211_MODE_AUTO] = IFM_AUTO,
[IEEE80211_MODE_11A] = IFM_IEEE80211_11A,
[IEEE80211_MODE_11B] = IFM_IEEE80211_11B,
@@ -1699,13 +1699,13 @@
case IEEE80211_MODE_11NA:
case IEEE80211_MODE_TURBO_A:
case IEEE80211_MODE_STURBO_A:
- return findmedia(rates, nitems(rates),
+ return findmedia(rates, nitems(rates),
rate | IFM_IEEE80211_11A);
case IEEE80211_MODE_11B:
- return findmedia(rates, nitems(rates),
+ return findmedia(rates, nitems(rates),
rate | IFM_IEEE80211_11B);
case IEEE80211_MODE_FH:
- return findmedia(rates, nitems(rates),
+ return findmedia(rates, nitems(rates),
rate | IFM_IEEE80211_FH);
case IEEE80211_MODE_AUTO:
/* NB: ic may be NULL for some drivers */
Index: sys/net80211/ieee80211_acl.c
===================================================================
--- sys/net80211/ieee80211_acl.c
+++ sys/net80211/ieee80211_acl.c
@@ -41,8 +41,8 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/queue.h>
Index: sys/net80211/ieee80211_action.c
===================================================================
--- sys/net80211/ieee80211_action.c
+++ sys/net80211/ieee80211_action.c
@@ -37,8 +37,8 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
+#include <sys/systm.h>
+
#include <sys/socket.h>
#include <net/if.h>
Index: sys/net80211/ieee80211_adhoc.c
===================================================================
--- sys/net80211/ieee80211_adhoc.c
+++ sys/net80211/ieee80211_adhoc.c
@@ -35,8 +35,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -299,7 +299,7 @@
struct ieee80211_frame *wh;
struct ieee80211_key *key;
struct ether_header *eh;
- int hdrspace, need_tap = 1; /* mbuf need to be tapped. */
+ int hdrspace, need_tap = 1; /* mbuf need to be tapped. */
uint8_t dir, type, subtype, qos;
uint8_t *bssid;
uint16_t rxseq;
@@ -712,7 +712,7 @@
/*
* We process beacon/probe response
* frames to discover neighbors.
- */
+ */
if (rxs != NULL) {
c = ieee80211_lookup_channel_rxstatus(vap, rxs);
if (c != NULL)
Index: sys/net80211/ieee80211_ageq.c
===================================================================
--- sys/net80211/ieee80211_ageq.c
+++ sys/net80211/ieee80211_ageq.c
@@ -32,9 +32,9 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/kernel.h>
-
+
#include <sys/socket.h>
#include <net/if.h>
Index: sys/net80211/ieee80211_amrr.c
===================================================================
--- sys/net80211/ieee80211_amrr.c
+++ sys/net80211/ieee80211_amrr.c
@@ -68,7 +68,7 @@
struct ieee80211_amrr_node *, struct ieee80211_node *);
static int amrr_rate(struct ieee80211_node *, void *, uint32_t);
static void amrr_tx_complete(const struct ieee80211vap *,
- const struct ieee80211_node *, int,
+ const struct ieee80211_node *, int,
void *, void *);
static void amrr_tx_update(const struct ieee80211vap *vap,
const struct ieee80211_node *, void *, void *, void *);
Index: sys/net80211/ieee80211_crypto.h
===================================================================
--- sys/net80211/ieee80211_crypto.h
+++ sys/net80211/ieee80211_crypto.h
@@ -220,7 +220,7 @@
return (cip->ic_miclen > 0 ? cip->ic_enmic(k, m, force) : 1);
}
-/*
+/*
* Reset key state to an unused state. The crypto
* key allocation mechanism insures other state (e.g.
* key data) is properly setup before a key is used.
Index: sys/net80211/ieee80211_crypto.c
===================================================================
--- sys/net80211/ieee80211_crypto.c
+++ sys/net80211/ieee80211_crypto.c
@@ -35,7 +35,7 @@
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/socket.h>
@@ -111,7 +111,7 @@
return key->wk_cipher->ic_attach(vap, key);
}
-/*
+/*
* Wrappers for driver key management methods.
*/
static __inline int
Index: sys/net80211/ieee80211_crypto_ccmp.c
===================================================================
--- sys/net80211/ieee80211_crypto_ccmp.c
+++ sys/net80211/ieee80211_crypto_ccmp.c
@@ -36,8 +36,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/module.h>
@@ -168,7 +168,7 @@
ivp[7] = k->wk_keytsc >> 40; /* PN5 */
/*
- * Finally, do software encrypt if neeed.
+ * Finally, do software encrypt if need.
*/
if ((k->wk_flags & IEEE80211_KEY_SWENCRYPT) &&
!ccmp_encrypt(k, m, hdrlen))
Index: sys/net80211/ieee80211_crypto_none.c
===================================================================
--- sys/net80211/ieee80211_crypto_none.c
+++ sys/net80211/ieee80211_crypto_none.c
@@ -32,9 +32,9 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/socket.h>
Index: sys/net80211/ieee80211_crypto_tkip.c
===================================================================
--- sys/net80211/ieee80211_crypto_tkip.c
+++ sys/net80211/ieee80211_crypto_tkip.c
@@ -36,8 +36,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/module.h>
@@ -195,7 +195,7 @@
ivp[7] = k->wk_keytsc >> 40; /* TSC5 */
/*
- * Finally, do software encrypt if neeed.
+ * Finally, do software encrypt if need.
*/
if (k->wk_flags & IEEE80211_KEY_SWENCRYPT) {
if (!tkip_encrypt(ctx, k, m, hdrlen))
@@ -337,7 +337,7 @@
vap->iv_stats.is_crypto_tkipdemic++;
- michael_mic(ctx, k->wk_rxmic,
+ michael_mic(ctx, k->wk_rxmic,
m, hdrlen, m->m_pkthdr.len - (hdrlen + tkip.ic_miclen),
mic);
m_copydata(m, m->m_pkthdr.len - tkip.ic_miclen,
Index: sys/net80211/ieee80211_crypto_wep.c
===================================================================
--- sys/net80211/ieee80211_crypto_wep.c
+++ sys/net80211/ieee80211_crypto_wep.c
@@ -32,8 +32,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/module.h>
@@ -184,7 +184,7 @@
ivp[3] = keyid;
/*
- * Finally, do software encrypt if neeed.
+ * Finally, do software encrypt if need.
*/
if ((k->wk_flags & IEEE80211_KEY_SWENCRYPT) &&
!wep_encrypt(k, m, hdrlen))
Index: sys/net80211/ieee80211_ddb.c
===================================================================
--- sys/net80211/ieee80211_ddb.c
+++ sys/net80211/ieee80211_ddb.c
@@ -34,7 +34,7 @@
* IEEE 802.11 DDB support
*/
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
Index: sys/net80211/ieee80211_dfs.c
===================================================================
--- sys/net80211/ieee80211_dfs.c
+++ sys/net80211/ieee80211_dfs.c
@@ -35,8 +35,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
Index: sys/net80211/ieee80211_freebsd.h
===================================================================
--- sys/net80211/ieee80211_freebsd.h
+++ sys/net80211/ieee80211_freebsd.h
@@ -129,7 +129,7 @@
mtx_unlock(IEEE80211_NODE_ITERATE_LOCK_OBJ(_nt))
/*
- * Power-save queue definitions.
+ * Power-save queue definitions.
*/
typedef struct mtx ieee80211_psq_lock_t;
#define IEEE80211_PSQ_INIT(_psq, _name) \
@@ -152,7 +152,7 @@
IF_UNLOCK(ifq); \
} while (0)
#endif /* IF_PREPEND_LIST */
-
+
/*
* Age queue definitions.
*/
Index: sys/net80211/ieee80211_freebsd.c
===================================================================
--- sys/net80211/ieee80211_freebsd.c
+++ sys/net80211/ieee80211_freebsd.c
@@ -33,9 +33,9 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/linker.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
Index: sys/net80211/ieee80211_hostap.c
===================================================================
--- sys/net80211/ieee80211_hostap.c
+++ sys/net80211/ieee80211_hostap.c
@@ -35,8 +35,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -218,7 +218,7 @@
!IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
/*
* Already have a channel; bypass the
- * scan and startup immediately.
+ * scan and startup immediately.
* ieee80211_create_ibss will call back to
* move us to RUN state.
*/
@@ -939,7 +939,7 @@
ni->ni_challenge = NULL;
}
/* XXX hack to workaround calling convention */
- ieee80211_send_error(ni, wh->i_addr2,
+ ieee80211_send_error(ni, wh->i_addr2,
IEEE80211_FC0_SUBTYPE_AUTH,
(seq + 1) | (IEEE80211_STATUS_ALG<<16));
return;
@@ -1389,7 +1389,7 @@
int n;
/*
- * Check the length once for fixed parts:
+ * Check the length once for fixed parts:
* version, mcast cipher, and 2 selector counts.
* Other, variable-length data, must be checked separately.
*/
@@ -1494,7 +1494,7 @@
}
if ((vap->iv_flags_ext & IEEE80211_FEXT_TSN) &&
(capinfo & IEEE80211_CAPINFO_PRIVACY)) {
- /*
+ /*
* Transitional Security Network. Permits clients
* to associate and use WEP while WPA is configured.
*/
@@ -1575,7 +1575,7 @@
struct mbuf *m;
struct l2_update_frame *l2uf;
struct ether_header *eh;
-
+
m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL) {
IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
@@ -1590,14 +1590,14 @@
/* src: associated STA */
IEEE80211_ADDR_COPY(eh->ether_shost, ni->ni_macaddr);
eh->ether_type = htons(sizeof(*l2uf) - sizeof(*eh));
-
+
l2uf->dsap = 0;
l2uf->ssap = 0;
l2uf->control = 0xf5;
l2uf->xid[0] = 0x81;
l2uf->xid[1] = 0x80;
l2uf->xid[2] = 0x00;
-
+
m->m_pkthdr.len = m->m_len = sizeof(*l2uf);
hostap_deliver_data(vap, ni, m);
}
@@ -1700,7 +1700,7 @@
* We process beacon/probe response frames when scanning;
* otherwise we check beacon frames for overlapping non-ERP
* BSS in 11g and/or overlapping legacy BSS when in HT.
- */
+ */
if ((ic->ic_flags & IEEE80211_F_SCAN) == 0 &&
subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) {
vap->iv_stats.is_rx_mgtdiscard++;
@@ -1764,7 +1764,7 @@
ieee80211_notify_erp(ic);
}
}
- /*
+ /*
* Check beacon for non-HT station on HT channel
* and update HT BSS occupancy as appropriate.
*/
@@ -1928,7 +1928,7 @@
authalgreject(ni, wh, algo,
4, IEEE80211_STATUS_CHALLENGE);
return;
- }
+ }
break;
}
@@ -2154,7 +2154,7 @@
#ifdef IEEE80211_SUPPORT_SUPERG
if (ath != NULL) {
setie(ath_ie, ath - sfrm);
- /*
+ /*
* Parse ATH station parameters.
*/
ieee80211_parse_ath(ni, ni->ni_ies.ath_ie);
@@ -2288,7 +2288,7 @@
vap->iv_stats.is_ps_badaid++;
/*
* NB: We used to deauth the station but it turns out
- * the Blackberry Curve 8230 (and perhaps other devices)
+ * the Blackberry Curve 8230 (and perhaps other devices)
* sometimes send the wrong AID when WME is negotiated.
* Being more lenient here seems ok as we already check
* the station is associated and we only return frames
@@ -2308,7 +2308,7 @@
vap->iv_set_tim(ni, 0); /* just in case */
return;
}
- /*
+ /*
* If there are more packets, set the more packets bit
* in the packet dispatched to the station; otherwise
* turn off the TIM bit.
Index: sys/net80211/ieee80211_ht.c
===================================================================
--- sys/net80211/ieee80211_ht.c
+++ sys/net80211/ieee80211_ht.c
@@ -37,9 +37,9 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/endian.h>
-
+
#include <sys/socket.h>
#include <net/if.h>
@@ -186,24 +186,24 @@
/*
* Register action frame handlers.
*/
- ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA,
+ ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA,
IEEE80211_ACTION_BA_ADDBA_REQUEST, ht_recv_action_ba_addba_request);
- ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA,
+ ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA,
IEEE80211_ACTION_BA_ADDBA_RESPONSE, ht_recv_action_ba_addba_response);
- ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA,
+ ieee80211_recv_action_register(IEEE80211_ACTION_CAT_BA,
IEEE80211_ACTION_BA_DELBA, ht_recv_action_ba_delba);
- ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT,
+ ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT,
IEEE80211_ACTION_HT_MIMOPWRSAVE, ht_recv_action_ht_mimopwrsave);
- ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT,
+ ieee80211_recv_action_register(IEEE80211_ACTION_CAT_HT,
IEEE80211_ACTION_HT_TXCHWIDTH, ht_recv_action_ht_txchwidth);
- ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA,
+ ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA,
IEEE80211_ACTION_BA_ADDBA_REQUEST, ht_send_action_ba_addba);
- ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA,
+ ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA,
IEEE80211_ACTION_BA_ADDBA_RESPONSE, ht_send_action_ba_addba);
- ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA,
+ ieee80211_send_action_register(IEEE80211_ACTION_CAT_BA,
IEEE80211_ACTION_BA_DELBA, ht_send_action_ba_delba);
- ieee80211_send_action_register(IEEE80211_ACTION_CAT_HT,
+ ieee80211_send_action_register(IEEE80211_ACTION_CAT_HT,
IEEE80211_ACTION_HT_TXCHWIDTH, ht_send_action_ht_txchwidth);
}
SYSINIT(wlan_ht, SI_SUB_DRIVERS, SI_ORDER_FIRST, ieee80211_ht_init, NULL);
@@ -456,7 +456,7 @@
/*
* Decap the encapsulated A-MSDU frames and dispatch all but
- * the last for delivery. The last frame is returned for
+ * the last for delivery. The last frame is returned for
* delivery via the normal path.
*/
struct mbuf *
@@ -827,7 +827,7 @@
* Sec 9.10.7.6.2 a) (p.137)
*/
#ifdef IEEE80211_AMPDU_AGE
- /*
+ /*
* Check for frames sitting too long in the reorder queue.
* This should only ever happen if frames are not delivered
* without the sender otherwise notifying us (e.g. with a
@@ -1102,7 +1102,7 @@
continue;
if (rap->rxa_qframes == 0)
continue;
- /*
+ /*
* Check for frames sitting too long in the reorder queue.
* See above for more details on what's happening here.
*/
@@ -1271,7 +1271,7 @@
protmode = IEEE80211_HTINFO_OPMODE_PROTOPT
| IEEE80211_HTINFO_NONHT_PRESENT;
} else if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&
- IEEE80211_IS_CHAN_HT40(ic->ic_bsschan) &&
+ IEEE80211_IS_CHAN_HT40(ic->ic_bsschan) &&
ic->ic_sta_assoc != ic->ic_ht40_sta_assoc) {
protmode = IEEE80211_HTINFO_OPMODE_HT20PR;
} else {
@@ -1378,7 +1378,7 @@
}
}
-/* unalligned little endian access */
+/* unalligned little endian access */
#define LE_READ_2(p) \
((uint16_t) \
((((const uint8_t *)(p))[0] ) | \
@@ -1724,7 +1724,7 @@
tap->txa_lastsample = ticks;
tap->txa_avgpps = 0;
- /* NB: clearing NAK means we may re-send ADDBA */
+ /* NB: clearing NAK means we may re-send ADDBA */
tap->txa_flags &= ~(IEEE80211_AGGR_SETUP | IEEE80211_AGGR_NAK);
}
@@ -2568,7 +2568,7 @@
if (m != NULL) {
*frm++ = category;
*frm++ = action;
- *frm++ = IEEE80211_IS_CHAN_HT40(ni->ni_chan) ?
+ *frm++ = IEEE80211_IS_CHAN_HT40(ni->ni_chan) ?
IEEE80211_A_HT_TXCHWIDTH_2040 :
IEEE80211_A_HT_TXCHWIDTH_20;
m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
@@ -2714,7 +2714,7 @@
frm++;
/* pre-zero remainder of ie */
- memset(frm, 0, sizeof(struct ieee80211_ie_htcap) -
+ memset(frm, 0, sizeof(struct ieee80211_ie_htcap) -
__offsetof(struct ieee80211_ie_htcap, hc_mcsset));
/* supported MCS set */
Index: sys/net80211/ieee80211_hwmp.c
===================================================================
--- sys/net80211/ieee80211_hwmp.c
+++ sys/net80211/ieee80211_hwmp.c
@@ -1,31 +1,31 @@
-/*-
- * Copyright (c) 2009 The FreeBSD Foundation
- * All rights reserved.
- *
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
* This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
+ * FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
#include <sys/cdefs.h>
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_hwmp.c 283614 2015-05-27 14:05:46Z glebius $");
@@ -287,7 +287,7 @@
callout_drain(&hs->hs_roottimer);
IEEE80211_FREE(vap->iv_hwmp, M_80211_VAP);
vap->iv_hwmp = NULL;
-}
+}
int
hwmp_newstate(struct ieee80211vap *vap, enum ieee80211_state ostate, int arg)
@@ -453,7 +453,7 @@
preq->preq_lifetime = LE_READ_4(iefrm_t); iefrm_t += 4;
preq->preq_metric = LE_READ_4(iefrm_t); iefrm_t += 4;
preq->preq_tcount = *iefrm_t++;
-
+
for (i = 0; i < preq->preq_tcount; i++) {
preq->preq_targets[i].target_flags = *iefrm_t++;
IEEE80211_ADDR_COPY(
@@ -990,7 +990,7 @@
return;
}
/*
- * Acceptance criteria: if unicast addressed
+ * Acceptance criteria: if unicast addressed
* AND no valid forwarding for Target of PREQ, discard this PREQ.
*/
if(rttarg != NULL)
Index: sys/net80211/ieee80211_input.h
===================================================================
--- sys/net80211/ieee80211_input.h
+++ sys/net80211/ieee80211_input.h
@@ -80,7 +80,7 @@
} while (0)
#endif /* !IEEE80211_DEBUG */
-/* unalligned little endian access */
+/* unalligned little endian access */
#define LE_READ_2(p) \
((uint16_t) \
((((const uint8_t *)(p))[0] ) | \
@@ -201,7 +201,7 @@
return 1;
}
- /*
+ /*
* Otherwise, retries for packets below or equal to the last
* seen sequence number should be dropped.
*/
Index: sys/net80211/ieee80211_input.c
===================================================================
--- sys/net80211/ieee80211_input.c
+++ sys/net80211/ieee80211_input.c
@@ -31,13 +31,13 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/endian.h>
#include <sys/kernel.h>
-
+
#include <sys/socket.h>
-
+
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_var.h>
@@ -353,7 +353,7 @@
/*
* The frame has an 802.3 header followed by an 802.2
* LLC header. The encapsulated frame length is in the
- * first header type field; save that and overwrite it
+ * first header type field; save that and overwrite it
* with the true type field found in the second. Then
* copy the 802.3 header up to where it belongs and
* adjust the mbuf contents to remove the void.
Index: sys/net80211/ieee80211_ioctl.h
===================================================================
--- sys/net80211/ieee80211_ioctl.h
+++ sys/net80211/ieee80211_ioctl.h
@@ -309,7 +309,7 @@
uint8_t im_ssid[IEEE80211_NWID_LEN];
};
-/*
+/*
* MAC ACL operations.
*/
enum {
Index: sys/net80211/ieee80211_ioctl.c
===================================================================
--- sys/net80211/ieee80211_ioctl.c
+++ sys/net80211/ieee80211_ioctl.c
@@ -41,7 +41,7 @@
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/systm.h>
-
+
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_dl.h>
@@ -1311,7 +1311,7 @@
* NB: if ni_associd is zero then the node is already cleaned
* up and we don't need to do this (we're safely holding a
* reference but should otherwise not modify it's state).
- */
+ */
if (ni->ni_associd == 0)
return;
mlmedebug(vap, ni->ni_macaddr, mop->op, mop->reason);
@@ -1586,8 +1586,8 @@
mlme.im_op == IEEE80211_MLME_ASSOC)
return setmlme_assoc_sta(vap, mlme.im_macaddr,
vap->iv_des_ssid[0].len, vap->iv_des_ssid[0].ssid);
- else if ((vap->iv_opmode == IEEE80211_M_IBSS ||
- vap->iv_opmode == IEEE80211_M_AHDEMO) &&
+ else if ((vap->iv_opmode == IEEE80211_M_IBSS ||
+ vap->iv_opmode == IEEE80211_M_AHDEMO) &&
mlme.im_op == IEEE80211_MLME_ASSOC)
return setmlme_assoc_adhoc(vap, mlme.im_macaddr,
mlme.im_ssid_len, mlme.im_ssid);
Index: sys/net80211/ieee80211_mesh.h
===================================================================
--- sys/net80211/ieee80211_mesh.h
+++ sys/net80211/ieee80211_mesh.h
@@ -1,31 +1,31 @@
-/*-
- * Copyright (c) 2009 The FreeBSD Foundation
- * All rights reserved.
- *
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
* This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
+ * FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
* $FreeBSD: head/sys/net80211/ieee80211_mesh.h 283555 2015-05-26 04:25:11Z adrian $
*/
#ifndef _NET80211_IEEE80211_MESH_H_
@@ -88,7 +88,7 @@
/* Authentication Protocol Identifier */
enum {
-
+
IEEE80211_MESHCONF_AUTH_DISABLED = 0,
/* Simultaneous Authenticaction of Equals */
IEEE80211_MESHCONF_AUTH_SEA = 1,
Index: sys/net80211/ieee80211_mesh.c
===================================================================
--- sys/net80211/ieee80211_mesh.c
+++ sys/net80211/ieee80211_mesh.c
@@ -1,31 +1,31 @@
-/*-
- * Copyright (c) 2009 The FreeBSD Foundation
- * All rights reserved.
- *
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
* This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
+ * FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
#include <sys/cdefs.h>
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_mesh.c 283555 2015-05-26 04:25:11Z adrian $");
@@ -40,8 +40,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -947,7 +947,7 @@
mesh_checkid(void *arg, struct ieee80211_node *ni)
{
uint16_t *r = arg;
-
+
if (*r == ni->ni_mllid)
*(uint16_t *)arg = 0;
}
@@ -1812,7 +1812,7 @@
goto out;
}
#ifdef IEEE80211_DEBUG
- if ((ieee80211_msg_debug(vap) &&
+ if ((ieee80211_msg_debug(vap) &&
(vap->iv_ic->ic_flags & IEEE80211_F_SCAN)) ||
ieee80211_msg_dumppkts(vap)) {
if_printf(ifp, "received %s from %s rssi %d\n",
@@ -2211,7 +2211,7 @@
return NULL;
}
}
-
+
/*
* Close frames are accepted if meshid is the same.
* Verify the other two types.
@@ -2256,7 +2256,7 @@
}
return NULL;
}
-
+
return (const struct ieee80211_meshpeer_ie *) mp;
}
@@ -2535,7 +2535,7 @@
(const struct ieee80211_meshlmetric_ie *)
(frm+2); /* action + code */
struct ieee80211_meshlmetric_ie lm_rep;
-
+
if (ie->lm_flags & IEEE80211_MESH_LMETRIC_FLAGS_REQ) {
lm_rep.lm_flags = 0;
lm_rep.lm_metric = mesh_airtime_calc(ni);
@@ -3032,7 +3032,7 @@
mesh_peer_timeout_backoff(struct ieee80211_node *ni)
{
uint32_t r;
-
+
r = arc4random();
ni->ni_mltval += r % ni->ni_mltval;
callout_reset(&ni->ni_mltimer, ni->ni_mltval, mesh_peer_timeout_cb,
@@ -3066,7 +3066,7 @@
IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_MESH,
ni, "mesh link timeout, state %d, retry counter %d",
ni->ni_mlstate, ni->ni_mlrcnt);
-
+
switch (ni->ni_mlstate) {
case IEEE80211_NODE_MESH_IDLE:
case IEEE80211_NODE_MESH_ESTABLISHED:
Index: sys/net80211/ieee80211_monitor.c
===================================================================
--- sys/net80211/ieee80211_monitor.c
+++ sys/net80211/ieee80211_monitor.c
@@ -35,8 +35,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
Index: sys/net80211/ieee80211_node.c
===================================================================
--- sys/net80211/ieee80211_node.c
+++ sys/net80211/ieee80211_node.c
@@ -30,13 +30,13 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
-
+
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_media.h>
@@ -205,7 +205,7 @@
}
}
-/*
+/*
* Port authorize/unauthorize interfaces for use by an authenticator.
*/
@@ -375,7 +375,7 @@
memcpy(ni->ni_meshid, vap->iv_mesh->ms_id, ni->ni_meshidlen);
#endif
}
- /*
+ /*
* Fix the channel and related attributes.
*/
/* clear DFS CAC state on previous channel */
@@ -555,7 +555,7 @@
printf("%s\n", fail & 0x10 ? "!" : "");
}
#endif /* IEEE80211_DEBUG */
-
+
/*
* Handle 802.11 ad hoc network merge. The
* convention, set by the Wireless Ethernet Compatibility Alliance
@@ -746,7 +746,7 @@
* Set the erp state (mostly the slot time) to deal with
* the auto-select case; this should be redundant if the
* mode is locked.
- */
+ */
ieee80211_reset_erp(ic);
ieee80211_wme_initparams(vap);
@@ -1454,7 +1454,7 @@
/*
* In adhoc demo mode there are no management
* frames to use to discover neighbor capabilities,
- * so blindly propagate the local configuration
+ * so blindly propagate the local configuration
* so we can do interesting things (e.g. use
* WME to disable ACK's).
*/
@@ -2060,7 +2060,7 @@
*/
if (ni == vap->iv_bss)
continue;
- if (ni->ni_associd != 0 ||
+ if (ni->ni_associd != 0 ||
(vap->iv_opmode == IEEE80211_M_IBSS ||
vap->iv_opmode == IEEE80211_M_AHDEMO)) {
/*
Index: sys/net80211/ieee80211_output.c
===================================================================
--- sys/net80211/ieee80211_output.c
+++ sys/net80211/ieee80211_output.c
@@ -32,13 +32,13 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/endian.h>
#include <sys/socket.h>
-
+
#include <net/bpf.h>
#include <net/ethernet.h>
#include <net/if.h>
@@ -59,7 +59,7 @@
#include <net80211/ieee80211_mesh.h>
#if defined(INET) || defined(INET6)
-#include <netinet/in.h>
+#include <netinet/in.h>
#endif
#ifdef INET
@@ -76,7 +76,7 @@
#define ETHER_HEADER_COPY(dst, src) \
memcpy(dst, src, sizeof(struct ether_header))
-/* unalligned little endian access */
+/* unalligned little endian access */
#define LE_WRITE_2(p, v) do { \
((uint8_t *)(p))[0] = (v) & 0xff; \
((uint8_t *)(p))[1] = ((v) >> 8) & 0xff; \
@@ -288,7 +288,7 @@
*/
if (ic->ic_flags & IEEE80211_F_SCAN)
ieee80211_cancel_anyscan(vap);
- /*
+ /*
* Find the node for the destination so we can do
* things like power save and fast frames aggregation.
*
@@ -936,7 +936,7 @@
return (ret);
}
-/*
+/*
* Assign priority to a frame based on any vlan tag assigned
* to the station and/or any Diffserv setting in an IP header.
* Finally, if an ACM policy is setup (in station mode) it's
@@ -965,7 +965,7 @@
goto done;
}
- /*
+ /*
* If node has a vlan tag then all traffic
* to it must have a matching tag.
*/
@@ -1136,7 +1136,7 @@
* Return the transmit key to use in sending a unicast frame.
* If a unicast key is set we use that. When no unicast key is set
* we fall back to the default transmit key.
- */
+ */
static __inline struct ieee80211_key *
ieee80211_crypto_getucastkey(struct ieee80211vap *vap,
struct ieee80211_node *ni)
@@ -1155,7 +1155,7 @@
* Return the transmit key to use in sending a multicast frame.
* Multicast traffic always uses the group key which is installed as
* the default tx key.
- */
+ */
static __inline struct ieee80211_key *
ieee80211_crypto_getmcastkey(struct ieee80211vap *vap,
struct ieee80211_node *ni)
@@ -1196,7 +1196,7 @@
ieee80211_seq seqno;
int meshhdrsize, meshae;
uint8_t *qos;
-
+
IEEE80211_TX_LOCK_ASSERT(ic);
/*
@@ -1716,7 +1716,7 @@
return frm;
}
-/*
+/*
* Add an ssid element to a frame.
*/
uint8_t *
@@ -1800,7 +1800,7 @@
.wme_info = 0,
};
memcpy(frm, &info, sizeof(info));
- return frm + sizeof(info);
+ return frm + sizeof(info);
}
/*
@@ -2368,7 +2368,7 @@
}
#ifdef IEEE80211_SUPPORT_SUPERG
if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) {
- frm = ieee80211_add_ath(frm,
+ frm = ieee80211_add_ath(frm,
IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS),
((vap->iv_flags & IEEE80211_F_WPA) == 0 &&
ni->ni_authmode != IEEE80211_AUTH_8021X) ?
@@ -2449,7 +2449,7 @@
}
#ifdef IEEE80211_SUPPORT_SUPERG
if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS))
- frm = ieee80211_add_ath(frm,
+ frm = ieee80211_add_ath(frm,
IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS),
((vap->iv_flags & IEEE80211_F_WPA) == 0 &&
ni->ni_authmode != IEEE80211_AUTH_8021X) ?
@@ -2916,7 +2916,7 @@
tie->tim_ie = IEEE80211_ELEMID_TIM;
tie->tim_len = 4; /* length */
- tie->tim_count = 0; /* DTIM count */
+ tie->tim_count = 0; /* DTIM count */
tie->tim_period = vap->iv_dtim_period; /* DTIM period */
tie->tim_bitctl = 0; /* bitmap control */
tie->tim_bitmap[0] = 0; /* Partial Virtual Bitmap */
@@ -2932,7 +2932,7 @@
frm = ieee80211_add_powerconstraint(frm, vap);
bo->bo_csa = frm;
if (ic->ic_flags & IEEE80211_F_CSAPENDING)
- frm = ieee80211_add_csa(frm, vap);
+ frm = ieee80211_add_csa(frm, vap);
} else
bo->bo_csa = frm;
@@ -3218,7 +3218,7 @@
(struct ieee80211_tim_ie *) bo->bo_tim;
if (isset(bo->bo_flags, IEEE80211_BEACON_TIM)) {
u_int timlen, timoff, i;
- /*
+ /*
* ATIM/DTIM needs updating. If it fits in the
* current space allocated then just copy in the
* new bits. Otherwise we need to move any trailing
Index: sys/net80211/ieee80211_power.c
===================================================================
--- sys/net80211/ieee80211_power.c
+++ sys/net80211/ieee80211_power.c
@@ -32,9 +32,9 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/kernel.h>
-
+
#include <sys/socket.h>
#include <net/if.h>
Index: sys/net80211/ieee80211_proto.c
===================================================================
--- sys/net80211/ieee80211_proto.c
+++ sys/net80211/ieee80211_proto.c
@@ -231,7 +231,7 @@
} else {
vap->iv_txparms[i].mgmtrate =
rs->rs_rates[0] & IEEE80211_RATE_VAL;
- vap->iv_txparms[i].mcastrate =
+ vap->iv_txparms[i].mcastrate =
rs->rs_rates[0] & IEEE80211_RATE_VAL;
}
#endif
@@ -445,7 +445,7 @@
break;
}
if (IEEE80211_QOS_HAS_SEQ(wh)) {
- const struct ieee80211_qosframe *qwh =
+ const struct ieee80211_qosframe *qwh =
(const struct ieee80211_qosframe *)buf;
printf(" QoS [TID %u%s]", qwh->i_qos[0] & IEEE80211_QOS_TID,
qwh->i_qos[0] & IEEE80211_QOS_ACKPOLICY ? " ACM" : "");
@@ -862,8 +862,8 @@
_setifsparams(struct wmeParams *wmep, const paramType *phy)
{
wmep->wmep_aifsn = phy->aifsn;
- wmep->wmep_logcwmin = phy->logcwmin;
- wmep->wmep_logcwmax = phy->logcwmax;
+ wmep->wmep_logcwmin = phy->logcwmin;
+ wmep->wmep_logcwmax = phy->logcwmax;
wmep->wmep_txopLimit = phy->txopLimit;
}
@@ -940,7 +940,7 @@
setwmeparams(vap, "chan", i, wmep, pPhyParam);
} else {
setwmeparams(vap, "chan", i, wmep, pBssPhyParam);
- }
+ }
wmep = &wme->wme_wmeBssChanParams.cap_wmeParams[i];
setwmeparams(vap, "bss ", i, wmep, pBssPhyParam);
}
@@ -1066,7 +1066,7 @@
/* XXX WDS? */
/* XXX MBSS? */
-
+
if (do_aggrmode) {
chanp = &wme->wme_chanParams.cap_wmeParams[WME_AC_BE];
bssp = &wme->wme_bssChanParams.cap_wmeParams[WME_AC_BE];
@@ -1078,7 +1078,7 @@
aggrParam[mode].logcwmax;
chanp->wmep_txopLimit = bssp->wmep_txopLimit =
(vap->iv_flags & IEEE80211_F_BURST) ?
- aggrParam[mode].txopLimit : 0;
+ aggrParam[mode].txopLimit : 0;
IEEE80211_DPRINTF(vap, IEEE80211_MSG_WME,
"update %s (chan+bss) [acm %u aifsn %u logcwmin %u "
"logcwmax %u txop %u]\n", ieee80211_wme_acnames[WME_AC_BE],
@@ -1310,7 +1310,7 @@
* we should be able to apply any new state/parameters
* simply by re-associating. Otherwise we need to
* re-scan to select an appropriate ap.
- */
+ */
if (vap->iv_state >= IEEE80211_S_RUN)
ieee80211_new_state_locked(vap,
IEEE80211_S_ASSOC, 1);
Index: sys/net80211/ieee80211_radiotap.c
===================================================================
--- sys/net80211/ieee80211_radiotap.c
+++ sys/net80211/ieee80211_radiotap.c
@@ -33,13 +33,13 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/endian.h>
#include <sys/kernel.h>
-
+
#include <sys/socket.h>
-
+
#include <net/bpf.h>
#include <net/if.h>
#include <net/if_var.h>
Index: sys/net80211/ieee80211_regdomain.c
===================================================================
--- sys/net80211/ieee80211_regdomain.c
+++ sys/net80211/ieee80211_regdomain.c
@@ -32,7 +32,7 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/socket.h>
@@ -318,7 +318,7 @@
ie->cc[0] = rd->isocc[0];
ie->cc[1] = rd->isocc[1];
}
- /*
+ /*
* Indoor/Outdoor portion of country string:
* 'I' indoor only
* 'O' outdoor only
@@ -326,7 +326,7 @@
*/
ie->cc[2] = (rd->location == 'I' ? 'I' :
rd->location == 'O' ? 'O' : ' ');
- /*
+ /*
* Run-length encoded channel+max tx power info.
*/
frm = (uint8_t *)&ie->band[0];
Index: sys/net80211/ieee80211_rssadapt.c
===================================================================
--- sys/net80211/ieee80211_rssadapt.c
+++ sys/net80211/ieee80211_rssadapt.c
@@ -131,7 +131,7 @@
KASSERT(vap->iv_rs == NULL, ("%s: iv_rs already initialized",
__func__));
-
+
vap->iv_rs = rs = IEEE80211_MALLOC(sizeof(struct ieee80211_rssadapt),
M_80211_RATECTL, IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
if (rs == NULL) {
@@ -174,7 +174,7 @@
const struct ieee80211_rateset *rs = &ni->ni_rates;
if (ni->ni_rctls == NULL) {
- ni->ni_rctls = ra =
+ ni->ni_rctls = ra =
IEEE80211_MALLOC(sizeof(struct ieee80211_rssadapt_node),
M_80211_RATECTL, IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
if (ra == NULL) {
Index: sys/net80211/ieee80211_scan.c
===================================================================
--- sys/net80211/ieee80211_scan.c
+++ sys/net80211/ieee80211_scan.c
@@ -32,11 +32,11 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/condvar.h>
-
+
#include <sys/socket.h>
#include <net/if.h>
@@ -544,7 +544,7 @@
printf(" rssi %d\n", rssi);
if (isnew) {
- printf("[%s] caps 0x%x bintval %u erp 0x%x",
+ printf("[%s] caps 0x%x bintval %u erp 0x%x",
ether_sprintf(mac), sp->capinfo, sp->bintval, sp->erp);
if (sp->country != NULL)
dump_country(sp->country);
Index: sys/net80211/ieee80211_scan_sta.c
===================================================================
--- sys/net80211/ieee80211_scan_sta.c
+++ sys/net80211/ieee80211_scan_sta.c
@@ -228,7 +228,7 @@
* entry in the scan cache or update any previous entry.
*/
static int
-sta_add(struct ieee80211_scan_state *ss,
+sta_add(struct ieee80211_scan_state *ss,
struct ieee80211_channel *curchan,
const struct ieee80211_scanparams *sp,
const struct ieee80211_frame *wh,
@@ -493,7 +493,7 @@
for (; scan->list != NULL; scan++) {
for (i = 0; i < scan->count; i++)
- if (scan->list[i] == c->ic_freq)
+ if (scan->list[i] == c->ic_freq)
return 1;
}
return 0;
@@ -534,7 +534,7 @@
continue;
/*
- * If a desired mode was specified, scan only
+ * If a desired mode was specified, scan only
* channels that satisfy that constraint.
*/
if (vap->iv_des_mode != IEEE80211_MODE_AUTO &&
@@ -593,7 +593,7 @@
mode = scan->mode;
if (vap->iv_des_mode != IEEE80211_MODE_AUTO) {
/*
- * If a desired mode was specified, scan only
+ * If a desired mode was specified, scan only
* channels that satisfy that constraint.
*/
if (vap->iv_des_mode != mode) {
@@ -737,12 +737,12 @@
return 0;
}
-/* unaligned little endian access */
+/* unaligned little endian access */
#define LE_READ_2(p) \
((uint16_t) \
((((const uint8_t *)(p))[0] ) | \
(((const uint8_t *)(p))[1] << 8)))
-
+
/*
* Demote any supplied 11g channel to 11b. There should
* always be an 11b channel but we check anyway...
@@ -894,7 +894,7 @@
r = RV(rs[i]);
badrate = r;
/*
- * Check any fixed rate is included.
+ * Check any fixed rate is included.
*/
if (r == ucastrate)
fixedrate = r;
@@ -1396,7 +1396,7 @@
* the callback function on each one.
*/
static void
-sta_iterate(struct ieee80211_scan_state *ss,
+sta_iterate(struct ieee80211_scan_state *ss,
ieee80211_scan_iter_func *f, void *arg)
{
struct sta_table *st = ss->ss_priv;
@@ -1504,7 +1504,7 @@
adhoc_start(struct ieee80211_scan_state *ss, struct ieee80211vap *vap)
{
struct sta_table *st = ss->ss_priv;
-
+
makescanlist(ss, vap, adhocScanTable);
if (ss->ss_mindwell == 0)
Index: sys/net80211/ieee80211_scan_sw.c
===================================================================
--- sys/net80211/ieee80211_scan_sw.c
+++ sys/net80211/ieee80211_scan_sw.c
@@ -32,11 +32,11 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/condvar.h>
-
+
#include <sys/socket.h>
#include <net/if.h>
Index: sys/net80211/ieee80211_sta.c
===================================================================
--- sys/net80211/ieee80211_sta.c
+++ sys/net80211/ieee80211_sta.c
@@ -35,8 +35,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -407,7 +407,7 @@
}
#endif
ieee80211_scan_assoc_success(vap, ni->ni_macaddr);
- ieee80211_notify_node_join(ni,
+ ieee80211_notify_node_join(ni,
arg == IEEE80211_FC0_SUBTYPE_ASSOC_RESP);
break;
case IEEE80211_S_SLEEP:
@@ -1316,7 +1316,7 @@
* o station mode when associated (to collect state
* updates such as 802.11g slot time)
* Frames otherwise received are discarded.
- */
+ */
if (!((ic->ic_flags & IEEE80211_F_SCAN) || ni->ni_associd)) {
vap->iv_stats.is_rx_mgtdiscard++;
return;
@@ -1587,7 +1587,7 @@
wh, "auth", "unsupported alg %d", algo);
vap->iv_stats.is_rx_auth_unsupported++;
return;
- }
+ }
break;
}
Index: sys/net80211/ieee80211_superg.c
===================================================================
--- sys/net80211/ieee80211_superg.c
+++ sys/net80211/ieee80211_superg.c
@@ -31,13 +31,13 @@
#ifdef IEEE80211_SUPPORT_SUPERG
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/endian.h>
#include <sys/socket.h>
-
+
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_llc.h>
@@ -168,7 +168,7 @@
ath->ath_defkeyix[0] = 0xff;
ath->ath_defkeyix[1] = 0x7f;
}
- return frm + sizeof(info);
+ return frm + sizeof(info);
}
#undef ATH_OUI_BYTES
@@ -229,7 +229,7 @@
*/
newflags = curflags = vap->iv_ic->ic_bsschan->ic_flags;
/* NB: BOOST is not in ic_flags, so get it from the ie */
- if (ath->ath_capability & ATHEROS_CAP_BOOST)
+ if (ath->ath_capability & ATHEROS_CAP_BOOST)
newflags |= IEEE80211_CHAN_TURBO;
else
newflags &= ~IEEE80211_CHAN_TURBO;
Index: sys/net80211/ieee80211_tdma.h
===================================================================
--- sys/net80211/ieee80211_tdma.h
+++ sys/net80211/ieee80211_tdma.h
@@ -85,7 +85,7 @@
const struct ieee80211_rx_stats *rxs, int, int);
void (*tdma_opdetach)(struct ieee80211vap *);
};
-
+
#define TDMA_UPDATE_SLOT 0x0001 /* tdma_slot changed */
#define TDMA_UPDATE_SLOTCNT 0x0002 /* tdma_slotcnt changed */
#define TDMA_UPDATE_SLOTLEN 0x0004 /* tdma_slotlen changed */
Index: sys/net80211/ieee80211_tdma.c
===================================================================
--- sys/net80211/ieee80211_tdma.c
+++ sys/net80211/ieee80211_tdma.c
@@ -39,8 +39,8 @@
#ifdef IEEE80211_SUPPORT_TDMA
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -262,7 +262,7 @@
} else {
status = ts->tdma_newstate(vap, nstate, arg);
}
- if (status == 0 &&
+ if (status == 0 &&
nstate == IEEE80211_S_RUN && ostate != IEEE80211_S_RUN &&
(vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) &&
ts->tdma_slot != 0 &&
@@ -520,7 +520,7 @@
{
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211_tdma_state *ts = vap->iv_tdma;
- const struct ieee80211_tdma_param *tdma =
+ const struct ieee80211_tdma_param *tdma =
(const struct ieee80211_tdma_param *) ie;
u_int len = ie[1];
@@ -698,7 +698,7 @@
*frm++ = ts->tdma_bintval;
*frm++ = ts->tdma_inuse[0];
frm += 10; /* pad+timestamp */
- return frm;
+ return frm;
#undef ADDSHORT
}
#undef TDMA_OUI_BYTES
Index: sys/net80211/ieee80211_var.h
===================================================================
--- sys/net80211/ieee80211_var.h
+++ sys/net80211/ieee80211_var.h
@@ -456,7 +456,7 @@
int (*iv_key_alloc)(struct ieee80211vap *,
struct ieee80211_key *,
ieee80211_keyix *, ieee80211_keyix *);
- int (*iv_key_delete)(struct ieee80211vap *,
+ int (*iv_key_delete)(struct ieee80211vap *,
const struct ieee80211_key *);
int (*iv_key_set)(struct ieee80211vap *,
const struct ieee80211_key *,
@@ -779,7 +779,7 @@
taskqueue_drain(ic->ic_tq, task);
}
-/*
+/*
* Key update synchronization methods. XXX should not be visible.
*/
static __inline void
Index: sys/net80211/ieee80211_wds.c
===================================================================
--- sys/net80211/ieee80211_wds.c
+++ sys/net80211/ieee80211_wds.c
@@ -35,8 +35,8 @@
#include "opt_wlan.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
@@ -325,7 +325,7 @@
/*
* Save the frame with an aging interval 4 times
- * the listen interval specified by the station.
+ * the listen interval specified by the station.
* Frames that sit around too long are reclaimed
* using this information.
* XXX handle overflow?
Index: sys/net80211/ieee80211_xauth.c
===================================================================
--- sys/net80211/ieee80211_xauth.c
+++ sys/net80211/ieee80211_xauth.c
@@ -43,8 +43,8 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/socket.h>

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 2, 3:13 AM (20 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37886817
Default Alt Text
D3595.id8570.diff (53 KB)

Event Timeline