diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-12-09 03:00:27 +0400 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-12-09 03:00:27 +0400 |
| commit | e5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6 (patch) | |
| tree | 3f021986a2415cfe9c2dca0bcc22411740dcd9b3 /net/mac80211/ht.c | |
| parent | dd5fe1046cb07d2a6665b6dbbfc6989b39ae063b (diff) | |
| parent | f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d (diff) | |
| download | linux-e5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index d3eafaefb16b..0fd9c2a7f242 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -47,7 +47,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, int i; if (sdata->vif.type != NL80211_IFTYPE_STATION) { - WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION); + /* AP interfaces call this code when adding new stations, + * so just silently ignore non station interfaces. + */ return; } @@ -282,6 +284,8 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN); else if (sdata->vif.type == NL80211_IFTYPE_STATION) memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN); + else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) + memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN); mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); |