diff --git a/[refs] b/[refs] index 75e254026bc1..077ae10790e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 881400a20c3551e90eed1062cf0387fa686a2fd0 +refs/heads/master: 16f2e85d3151efa643879fa5aa87c9d77d60f57e diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index e3a214f63f91..f68a5c8f2147 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/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], ¶ms.station_flags))