diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-06-10 04:21:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-14 15:39:26 -0400 |
commit | 77a121c3a88eb00a4b5e753d083dbb7d49fefb0a (patch) | |
tree | d1c802c9133a149094b484cd4796faeb9d7201fb /net/mac80211/ieee80211_i.h | |
parent | 36b3a628a4e85d002ee8813ebd2a5caef6d3c1a7 (diff) |
mac80211: pull mgmt frame rx into rx handler
Some code is duplicated between ibss, mesh and
managed mode regarding the queueing of management
frames. Since all modes now use a common skb
queue and a common work function, we can pull
the queueing code into the rx handler directly
and remove the duplicated length checks etc.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index f8c8f101592b..a3bcaa3239d9 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -981,8 +981,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, | |||
981 | int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, | 981 | int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, |
982 | struct cfg80211_disassoc_request *req, | 982 | struct cfg80211_disassoc_request *req, |
983 | void *cookie); | 983 | void *cookie); |
984 | ieee80211_rx_result ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, | ||
985 | struct sk_buff *skb); | ||
986 | void ieee80211_send_pspoll(struct ieee80211_local *local, | 984 | void ieee80211_send_pspoll(struct ieee80211_local *local, |
987 | struct ieee80211_sub_if_data *sdata); | 985 | struct ieee80211_sub_if_data *sdata); |
988 | void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency); | 986 | void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency); |
@@ -1002,8 +1000,6 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, | |||
1002 | /* IBSS code */ | 1000 | /* IBSS code */ |
1003 | void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local); | 1001 | void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local); |
1004 | void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata); | 1002 | void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata); |
1005 | ieee80211_rx_result | ||
1006 | ieee80211_ibss_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb); | ||
1007 | struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, | 1003 | struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, |
1008 | u8 *bssid, u8 *addr, u32 supp_rates, | 1004 | u8 *bssid, u8 *addr, u32 supp_rates, |
1009 | gfp_t gfp); | 1005 | gfp_t gfp); |