svn commit: r224717 - head/sys/net80211

[Bernhard Schmidt]

Author: bschmidt
Date: Mon Aug  8 16:29:07 2011
New Revision: 224717
URL: http://svn.freebsd.org/changeset/base/224717

Log:
  When setting a fixed channel on adapters with 11n support the scan
  channel list ends up with 2 entries, the HT and the legacy channel.
  The scan itself is currently always done at legacy rates so we end
  up receiving scan results for legacy networks on the HT channel and
  erroneously assigning the BSS to the 11n channel. As the channel's
  capabilities are used to setup the adapter we might end up with
  non-working settings and/or firmware crashes.
  
  Fix this by ensuring that scan results received on a HT channel
  are only assigned to that channel if the htcap IE is available,
  else use the legacy channel equivalent.
  
  Tested by:	Pawel Worach, Raoul Megelas, Maciej Milewski,
  		Andrei <az at azsupport dot com>
  Approved by:	re (kib)

Modified:
  head/sys/net80211/ieee80211_scan_sta.c

Modified: head/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sta.c	Mon Aug  8 16:22:42 2011	(r224716)
+++ head/sys/net80211/ieee80211_scan_sta.c	Mon Aug  8 16:29:07 2011	(r224717)
@@ -238,6 +238,7 @@ sta_add(struct ieee80211_scan_state *ss,
 	const uint8_t *macaddr = wh->i_addr2;
 	struct ieee80211vap *vap = ss->ss_vap;
 	struct ieee80211com *ic = vap->iv_ic;
+	struct ieee80211_channel *c;
 	struct sta_entry *se;
 	struct ieee80211_scan_entry *ise;
 	int hash;
@@ -300,7 +301,6 @@ found:
 	 * association on the wrong channel.
 	 */
 	if (sp->status & IEEE80211_BPARSE_OFFCHAN) {
-		struct ieee80211_channel *c;
 		/*
 		 * Off-channel, locate the home/bss channel for the sta
 		 * using the value broadcast in the DSPARMS ie.  We know
@@ -317,6 +317,14 @@ found:
 		}
 	} else
 		ise->se_chan = ic->ic_curchan;
+	if (IEEE80211_IS_CHAN_HT(ise->se_chan) && sp->htcap == NULL) {
+		/* Demote legacy networks to a non-HT channel. */
+		c = ieee80211_find_channel(ic, ise->se_chan->ic_freq,
+		    ise->se_chan->ic_flags & ~IEEE80211_CHAN_HT);
+		KASSERT(c != NULL,
+		    ("no legacy channel %u", ise->se_chan->ic_ieee));
+		ise->se_chan = c;
+	}
 	ise->se_fhdwell = sp->fhdwell;
 	ise->se_fhindex = sp->fhindex;
 	ise->se_erp = sp->erp;