aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-08-20 16:34:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-28 14:40:29 -0400
commit103bf9f7d35849bce52ad412e4da5063b0716969 (patch)
tree67712138dc332cc42f3cc69ab2db9dbb60b4b4e1 /net/mac80211
parentb0a4e7d8a291de63f35b04464de9ab4a83d38a7c (diff)
mac80211: remove ieee80211_rx namespace hack
With the libipw naming scheme change, it is no longer necessary for mac80211 to avoid the ieee80211_rx name clash. Reported-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 7065fd7e7ba2..dff2239db6e2 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2440,7 +2440,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local,
2440 * This is the receive path handler. It is called by a low level driver when an 2440 * This is the receive path handler. It is called by a low level driver when an
2441 * 802.11 MPDU is received from the hardware. 2441 * 802.11 MPDU is received from the hardware.
2442 */ 2442 */
2443void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) 2443void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
2444{ 2444{
2445 struct ieee80211_local *local = hw_to_local(hw); 2445 struct ieee80211_local *local = hw_to_local(hw);
2446 struct ieee80211_rate *rate = NULL; 2446 struct ieee80211_rate *rate = NULL;
@@ -2523,7 +2523,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
2523 2523
2524 rcu_read_unlock(); 2524 rcu_read_unlock();
2525} 2525}
2526EXPORT_SYMBOL(__ieee80211_rx); 2526EXPORT_SYMBOL(ieee80211_rx);
2527 2527
2528/* This is a version of the rx handler that can be called from hard irq 2528/* This is a version of the rx handler that can be called from hard irq
2529 * context. Post the skb on the queue and schedule the tasklet */ 2529 * context. Post the skb on the queue and schedule the tasklet */