diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-09 18:10:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-09 18:10:14 -0400 |
| commit | b41f5bfff73f244101b34f3603974ef7aeadf545 (patch) | |
| tree | 5c7fc7de15a020cde0f99fac3e61d981a1d59022 /net/wireless/nl80211.c | |
| parent | bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 (diff) | |
| parent | e91e9d490d9ae382003ef9d05fd50238db54c35b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e3a214f63f91..f68a5c8f2147 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) | |||
| 945 | nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]); | 945 | nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]); |
| 946 | params.listen_interval = | 946 | params.listen_interval = |
| 947 | nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]); | 947 | nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]); |
| 948 | params.listen_interval = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]); | 948 | params.aid = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]); |
| 949 | 949 | ||
| 950 | if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS], | 950 | if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS], |
| 951 | ¶ms.station_flags)) | 951 | ¶ms.station_flags)) |