summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-04-07 14:35:46 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-04-07 22:19:30 -0400
commit16f2e85d3151efa643879fa5aa87c9d77d60f57e (patch)
tree10490ca8550850a80c5f9c27cb9bd0b9f4b1a228 /net
parent881400a20c3551e90eed1062cf0387fa686a2fd0 (diff)
downloadlinux-3.10-16f2e85d3151efa643879fa5aa87c9d77d60f57e.tar.gz
linux-3.10-16f2e85d3151efa643879fa5aa87c9d77d60f57e.tar.bz2
linux-3.10-16f2e85d3151efa643879fa5aa87c9d77d60f57e.zip
nl80211: fix STA AID bug
This fixes the STA AID setting and actually makes hostapd/mac80211 work properly in presence of power-saving stations. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e3a214f63f9..f68a5c8f214 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -945,7 +945,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
params.listen_interval =
nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]);
- params.listen_interval = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]);
+ params.aid = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]);
if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS],
&params.station_flags))