diff options
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 87b2ac85d91..290b0017ef2 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -1565,8 +1565,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, | |||
1565 | (unsigned long long) sta->sta.supp_rates[band]); | 1565 | (unsigned long long) sta->sta.supp_rates[band]); |
1566 | #endif | 1566 | #endif |
1567 | } else { | 1567 | } else { |
1568 | ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid, | 1568 | ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates); |
1569 | mgmt->sa, supp_rates); | ||
1570 | } | 1569 | } |
1571 | 1570 | ||
1572 | rcu_read_unlock(); | 1571 | rcu_read_unlock(); |
@@ -1638,9 +1637,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, | |||
1638 | sdata->dev->name, mgmt->bssid); | 1637 | sdata->dev->name, mgmt->bssid); |
1639 | #endif | 1638 | #endif |
1640 | ieee80211_sta_join_ibss(sdata, &sdata->u.sta, bss); | 1639 | ieee80211_sta_join_ibss(sdata, &sdata->u.sta, bss); |
1641 | ieee80211_ibss_add_sta(sdata, NULL, | 1640 | ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates); |
1642 | mgmt->bssid, mgmt->sa, | ||
1643 | supp_rates); | ||
1644 | } | 1641 | } |
1645 | } | 1642 | } |
1646 | 1643 | ||
@@ -2373,8 +2370,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata) | |||
2373 | * must be callable in atomic context. | 2370 | * must be callable in atomic context. |
2374 | */ | 2371 | */ |
2375 | struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, | 2372 | struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, |
2376 | struct sk_buff *skb, u8 *bssid, | 2373 | u8 *bssid,u8 *addr, u64 supp_rates) |
2377 | u8 *addr, u64 supp_rates) | ||
2378 | { | 2374 | { |
2379 | struct ieee80211_local *local = sdata->local; | 2375 | struct ieee80211_local *local = sdata->local; |
2380 | struct sta_info *sta; | 2376 | struct sta_info *sta; |