diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-17 03:25:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-17 03:25:48 +0200 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /net/mac80211/wext.c | |
| parent | netns: introduce the net_hash_mix "salt" for hashes (diff) | |
| parent | atm: [he] send idle cells instead of unassigned when in SDH mode (diff) | |
| download | linux-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.tar.xz linux-caea902f72b053fd0c76d0d3b6b2e057beb3fc64.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'net/mac80211/wext.c')
| -rw-r--r-- | net/mac80211/wext.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 4806d96b9877..5af3862e7191 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; |