Author: rpaulo
Date: Wed Apr 14 18:29:40 2010
New Revision: 206617
URL: http://svn.freebsd.org/changeset/base/206617
Log:
Make this code a little more portable by wrapping the mtx calls into
macros.
MFC after: 1 week
Modified:
head/sys/net80211/ieee80211_freebsd.h
head/sys/net80211/ieee80211_scan_sta.c
Modified: head/sys/net80211/ieee80211_freebsd.h
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.h Wed Apr 14 18:29:34 2010
(r206616)
+++ head/sys/net80211/ieee80211_freebsd.h Wed Apr 14 18:29:40 2010
(r206617)
@@ -148,6 +148,16 @@ typedef struct mtx acl_lock_t;
mtx_assert((&(_as)->as_lock), MA_OWNED)
/*
+ * Scan table definitions.
+ */
+typedef struct mtx ieee80211_scan_table_lock_t;
+#define IEEE80211_SCAN_TABLE_LOCK_INIT(_st, _name) \
+ mtx_init(&(_st)->st_lock, _name, "802.11 scan table", MTX_DEF)
+#define IEEE80211_SCAN_TABLE_LOCK_DESTROY(_st)
mtx_destroy(&(_st)->st_lock)
+#define IEEE80211_SCAN_TABLE_LOCK(_st)
mtx_lock(&(_st)->st_lock)
+#define IEEE80211_SCAN_TABLE_UNLOCK(_st)
mtx_unlock(&(_st)->st_lock)
+
+/*
* Node reference counting definitions.
*
* ieee80211_node_initref initialize the reference count to 1
Modified: head/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sta.c Wed Apr 14 18:29:34 2010
(r206616)
+++ head/sys/net80211/ieee80211_scan_sta.c Wed Apr 14 18:29:40 2010
(r206617)
@@ -97,7 +97,7 @@ struct sta_entry {
CTASSERT(MAX_IEEE_CHAN >= 256);
struct sta_table {
- struct mtx st_lock; /* on scan table */
+ ieee80211_scan_table_lock_t st_lock; /* on scan table */
TAILQ_HEAD(, sta_entry) st_entry; /* all entries */
LIST_HEAD(, sta_entry) st_hash[STA_HASHSIZE];
struct mtx st_scanlock; /* on st_scaniter */
@@ -161,7 +161,7 @@ sta_attach(struct ieee80211_scan_state *
M_80211_SCAN, M_NOWAIT | M_ZERO);
if (st == NULL)
return 0;
- mtx_init(&st->st_lock, "scantable", "802.11 scan table", MTX_DEF);
+ IEEE80211_SCAN_TABLE_LOCK_INIT(st, "scantable");
mtx_init(&st->st_scanlock, "scangen", "802.11 scangen", MTX_DEF);
TAILQ_INIT(&st->st_entry);
ss->ss_priv = st;
@@ -179,7 +179,7 @@ sta_detach(struct ieee80211_scan_state *
if (st != NULL) {
sta_flush_table(st);
- mtx_destroy(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK_DESTROY(st);
mtx_destroy(&st->st_scanlock);
free(st, M_80211_SCAN);
KASSERT(nrefs > 0, ("imbalanced attach/detach"));
@@ -196,9 +196,9 @@ sta_flush(struct ieee80211_scan_state *s
{
struct sta_table *st = ss->ss_priv;
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
sta_flush_table(st);
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
ss->ss_last = 0;
return 0;
}
@@ -244,14 +244,14 @@ sta_add(struct ieee80211_scan_state *ss,
hash = STA_HASH(macaddr);
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
LIST_FOREACH(se, &st->st_hash[hash], se_hash)
if (IEEE80211_ADDR_EQ(se->base.se_macaddr, macaddr))
goto found;
se = (struct sta_entry *) malloc(sizeof(struct sta_entry),
M_80211_SCAN, M_NOWAIT | M_ZERO);
if (se == NULL) {
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
return 0;
}
se->se_scangen = st->st_scaniter-1;
@@ -370,7 +370,7 @@ found:
if (rssi > st->st_maxrssi[sp->bchan])
st->st_maxrssi[sp->bchan] = rssi;
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
/*
* If looking for a quick choice and nothing's
@@ -1132,7 +1132,7 @@ sta_update_notseen(struct sta_table *st)
{
struct sta_entry *se;
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
TAILQ_FOREACH(se, &st->st_entry, se_list) {
/*
* If seen the reset and don't bump the count;
@@ -1146,7 +1146,7 @@ sta_update_notseen(struct sta_table *st)
else
se->se_notseen++;
}
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
}
static void
@@ -1154,11 +1154,11 @@ sta_dec_fails(struct sta_table *st)
{
struct sta_entry *se;
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
TAILQ_FOREACH(se, &st->st_entry, se_list)
if (se->se_fails)
se->se_fails--;
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
}
static struct sta_entry *
@@ -1169,7 +1169,7 @@ select_bss(struct ieee80211_scan_state *
IEEE80211_DPRINTF(vap, debug, " %s\n",
"macaddr bssid chan rssi rate flag wep essid");
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
TAILQ_FOREACH(se, &st->st_entry, se_list) {
ieee80211_ies_expand(&se->base.se_ies);
if (match_bss(vap, ss, se, debug) == 0) {
@@ -1179,7 +1179,7 @@ select_bss(struct ieee80211_scan_state *
selbs = se;
}
}
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
return selbs;
}
@@ -1258,11 +1258,11 @@ sta_lookup(struct sta_table *st, const u
struct sta_entry *se;
int hash = STA_HASH(macaddr);
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
LIST_FOREACH(se, &st->st_hash[hash], se_hash)
if (IEEE80211_ADDR_EQ(se->base.se_macaddr, macaddr))
break;
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
return se; /* NB: unlocked */
}
@@ -1382,18 +1382,18 @@ sta_iterate(struct ieee80211_scan_state
mtx_lock(&st->st_scanlock);
gen = st->st_scaniter++;
restart:
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
TAILQ_FOREACH(se, &st->st_entry, se_list) {
if (se->se_scangen != gen) {
se->se_scangen = gen;
/* update public state */
se->base.se_age = ticks - se->se_lastupdate;
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
(*f)(arg, &se->base);
goto restart;
}
}
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
mtx_unlock(&st->st_scanlock);
}
@@ -1510,7 +1510,7 @@ adhoc_pick_channel(struct ieee80211_scan
bestchan = NULL;
bestrssi = -1;
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
for (i = 0; i < ss->ss_last; i++) {
c = ss->ss_chans[i];
/* never consider a channel with radar */
@@ -1532,7 +1532,7 @@ adhoc_pick_channel(struct ieee80211_scan
if (bestchan == NULL || maxrssi < bestrssi)
bestchan = c;
}
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
return bestchan;
}
@@ -1638,7 +1638,7 @@ adhoc_age(struct ieee80211_scan_state *s
struct sta_table *st = ss->ss_priv;
struct sta_entry *se, *next;
- mtx_lock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_LOCK(st);
TAILQ_FOREACH_SAFE(se, &st->st_entry, se_list, next) {
if (se->se_notseen > STA_PURGE_SCANS) {
TAILQ_REMOVE(&st->st_entry, se, se_list);
@@ -1647,7 +1647,7 @@ adhoc_age(struct ieee80211_scan_state *s
free(se, M_80211_SCAN);
}
}
- mtx_unlock(&st->st_lock);
+ IEEE80211_SCAN_TABLE_UNLOCK(st);
}
static const struct ieee80211_scanner adhoc_default = {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
