aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-01-31 13:48:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:03 -0500
commit589052904a60f00dd2cbc1d3488ee3f520a7de21 (patch)
tree7fa7c83895b38ae84ec12ff035862bb3291952d9 /net/mac80211/ieee80211_i.h
parent2c9745e5684ad75d02020bcaa31ab6d4b498e1e1 (diff)
mac80211: remove "dynamic" RX/TX handlers
It doesn't really make sense to have extra pointers to the RX/TX handler arrays instead of just using the arrays directly, that also allows us to make them static. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 21d54b27ccc1..1129a4299de7 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -190,12 +190,6 @@ struct ieee80211_tx_stored_packet {
190 unsigned int last_frag_rate_ctrl_probe; 190 unsigned int last_frag_rate_ctrl_probe;
191}; 191};
192 192
193typedef ieee80211_tx_result (*ieee80211_tx_handler)
194(struct ieee80211_txrx_data *tx);
195
196typedef ieee80211_rx_result (*ieee80211_rx_handler)
197(struct ieee80211_txrx_data *rx);
198
199struct beacon_data { 193struct beacon_data {
200 u8 *head, *tail; 194 u8 *head, *tail;
201 int head_len, tail_len; 195 int head_len, tail_len;
@@ -477,9 +471,6 @@ struct ieee80211_local {
477 * deliver multicast frames both back to wireless 471 * deliver multicast frames both back to wireless
478 * media and to the local net stack */ 472 * media and to the local net stack */
479 473
480 ieee80211_rx_handler *rx_handlers;
481 ieee80211_tx_handler *tx_handlers;
482
483 struct list_head interfaces; 474 struct list_head interfaces;
484 475
485 bool sta_sw_scanning; 476 bool sta_sw_scanning;
@@ -779,11 +770,7 @@ int ieee80211_if_remove(struct net_device *dev, const char *name, int id);
779void ieee80211_if_free(struct net_device *dev); 770void ieee80211_if_free(struct net_device *dev);
780void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata); 771void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata);
781 772
782/* rx handling */
783extern ieee80211_rx_handler ieee80211_rx_handlers[];
784
785/* tx handling */ 773/* tx handling */
786extern ieee80211_tx_handler ieee80211_tx_handlers[];
787void ieee80211_clear_tx_pending(struct ieee80211_local *local); 774void ieee80211_clear_tx_pending(struct ieee80211_local *local);
788void ieee80211_tx_pending(unsigned long data); 775void ieee80211_tx_pending(unsigned long data);
789int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); 776int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev);