aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorRami Rosen <ramirose@gmail.com>2008-12-11 07:00:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-12 14:45:27 -0500
commitab1f5c0bb8edbaee81c1672733f8dc4d0a5f5ea5 (patch)
tree3eb339986b05fdbd9e5e4a221a4a842af7ab9c20 /net/mac80211
parent4dec9b807be757780ca3611a959ac22c28d292a7 (diff)
mac80211: misc cleanups
This patch removes unneeded member (skbuff) from ieee80211_ibss_add_sta() method in its declaration (in ieee80211_i.h) and its callers (in rx.c and mlme.c) This patch removes unneeded member from struct ieee80211_rx_data in ieee80211_i.h. (Originally posted as two patches. -- JWL) Signed-off-by: Rami Rosen <ramirose@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_i.h4
-rw-r--r--net/mac80211/mlme.c10
-rw-r--r--net/mac80211/rx.c5
3 files changed, 6 insertions, 13 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 527205f8c1a..6f59e11d7b3 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -187,7 +187,6 @@ struct ieee80211_rx_data {
187 struct ieee80211_rx_status *status; 187 struct ieee80211_rx_status *status;
188 struct ieee80211_rate *rate; 188 struct ieee80211_rate *rate;
189 189
190 u16 ethertype;
191 unsigned int flags; 190 unsigned int flags;
192 int sent_ps_buffered; 191 int sent_ps_buffered;
193 int queue; 192 int queue;
@@ -864,8 +863,7 @@ int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid);
864void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata, 863void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata,
865 struct ieee80211_if_sta *ifsta); 864 struct ieee80211_if_sta *ifsta);
866struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 865struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
867 struct sk_buff *skb, u8 *bssid, 866 u8 *bssid, u8 *addr, u64 supp_rates);
868 u8 *addr, u64 supp_rates);
869int ieee80211_sta_deauthenticate(struct ieee80211_sub_if_data *sdata, u16 reason); 867int ieee80211_sta_deauthenticate(struct ieee80211_sub_if_data *sdata, u16 reason);
870int ieee80211_sta_disassociate(struct ieee80211_sub_if_data *sdata, u16 reason); 868int ieee80211_sta_disassociate(struct ieee80211_sub_if_data *sdata, u16 reason);
871u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata); 869u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata);
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 */
2375struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 2372struct 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;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 23443de7ee4..73cf126cef4 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1850,9 +1850,8 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
1850 return 0; 1850 return 0;
1851 rx->flags &= ~IEEE80211_RX_RA_MATCH; 1851 rx->flags &= ~IEEE80211_RX_RA_MATCH;
1852 } else if (!rx->sta) 1852 } else if (!rx->sta)
1853 rx->sta = ieee80211_ibss_add_sta(sdata, rx->skb, 1853 rx->sta = ieee80211_ibss_add_sta(sdata, bssid, hdr->addr2,
1854 bssid, hdr->addr2, 1854 BIT(rx->status->rate_idx));
1855 BIT(rx->status->rate_idx));
1856 break; 1855 break;
1857 case NL80211_IFTYPE_MESH_POINT: 1856 case NL80211_IFTYPE_MESH_POINT:
1858 if (!multicast && 1857 if (!multicast &&