diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
| commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
| tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/wireless | |
| parent | f5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff) | |
| parent | 159d83363b629c91d020734207c1bc788b96af5a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/wireless')
| -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 64a7460af734..2bdd4dddc0e1 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -1161,7 +1161,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) | |||
| 1161 | nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]); | 1161 | nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]); |
| 1162 | params.listen_interval = | 1162 | params.listen_interval = |
| 1163 | nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]); | 1163 | nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]); |
| 1164 | params.listen_interval = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]); | 1164 | params.aid = nla_get_u16(info->attrs[NL80211_ATTR_STA_AID]); |
| 1165 | 1165 | ||
| 1166 | if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS], | 1166 | if (parse_station_flags(info->attrs[NL80211_ATTR_STA_FLAGS], |
| 1167 | ¶ms.station_flags)) | 1167 | ¶ms.station_flags)) |