diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-14 17:33:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-14 17:33:38 -0700 |
| commit | 34a5d713056c325e5bf2b5361646585d5f550a72 (patch) | |
| tree | d2dc0fb65b30469c877e79bc70c7345097aef31c /net | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
| parent | cb62eccd7d946f7fb92b8beb79988726ec92c227 (diff) | |
| download | linux-stable-34a5d713056c325e5bf2b5361646585d5f550a72.tar.gz linux-stable-34a5d713056c325e5bf2b5361646585d5f550a72.tar.bz2 linux-stable-34a5d713056c325e5bf2b5361646585d5f550a72.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -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 a8bb8e31b1ec..6106cb79060c 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c @@ -496,7 +496,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 dc1598b86004..635b996c8c35 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -673,7 +673,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 */ |