diff options
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/wext.c | 3 | ||||
| -rw-r--r-- | net/mac80211/wme.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 4806d96b987..5af3862e719 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c @@ -508,7 +508,8 @@ static int ieee80211_ioctl_giwap(struct net_device *dev, sdata = IEEE80211_DEV_TO_SUB_IF(dev); if (sdata->vif.type == IEEE80211_IF_TYPE_STA || sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { - if (sdata->u.sta.state == IEEE80211_ASSOCIATED) { + if (sdata->u.sta.state == IEEE80211_ASSOCIATED || + sdata->u.sta.state == IEEE80211_IBSS_JOINED) { ap_addr->sa_family = ARPHRD_ETHER; memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN); return 0; diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index d8c2f9688b2..cfa8fbb0736 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -637,7 +637,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, #ifdef CONFIG_MAC80211_HT_DEBUG if (net_ratelimit()) printk(KERN_DEBUG "allocated aggregation queue" - " %d tid %d addr %s pool=0x%lX", + " %d tid %d addr %s pool=0x%lX\n", i, tid, print_mac(mac, sta->addr), q->qdisc_pool[0]); #endif /* CONFIG_MAC80211_HT_DEBUG */ |