diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-08-06 07:22:01 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-22 16:29:59 -0400 |
commit | 48c2fc59aa415ba92be0ad3a7e741c46883e3944 (patch) | |
tree | 967378bd9431e43bff88f0070acf9380f48729b5 /net/mac80211/wext.c | |
parent | 06303352d3de02a371ccaec1366a92db5e1d7c30 (diff) |
mac80211: cleanup mlme state namespace
This patch move add STA_MLME to station mlme state defines.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wext.c')
-rw-r--r-- | net/mac80211/wext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 735daa355c37..beae664ab480 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
@@ -535,8 +535,8 @@ static int ieee80211_ioctl_giwap(struct net_device *dev, | |||
535 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 535 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
536 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA || | 536 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA || |
537 | sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { | 537 | sdata->vif.type == IEEE80211_IF_TYPE_IBSS) { |
538 | if (sdata->u.sta.state == IEEE80211_ASSOCIATED || | 538 | if (sdata->u.sta.state == IEEE80211_STA_MLME_ASSOCIATED || |
539 | sdata->u.sta.state == IEEE80211_IBSS_JOINED) { | 539 | sdata->u.sta.state == IEEE80211_STA_MLME_IBSS_JOINED) { |
540 | ap_addr->sa_family = ARPHRD_ETHER; | 540 | ap_addr->sa_family = ARPHRD_ETHER; |
541 | memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN); | 541 | memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN); |
542 | return 0; | 542 | return 0; |