From 82e09333932885572c106f2afdfd2c1ced8e27e4 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 7 Apr 2008 14:35:46 +0200 Subject: [PATCH] --- yaml --- r: 88263 b: refs/heads/master c: 16f2e85d3151efa643879fa5aa87c9d77d60f57e h: refs/heads/master i: 88261: df81714ea72c4c2b9ed10575904eaec50771c0f5 88259: d8bbbbd8e2c4387933ba74fba2f4341b031eb84f 88255: 12de798c3944928ed8dae9e5dba774deb3305583 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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))