evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: remove ieee80211_rx namespace hack

Browse source 
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>
This commit is contained in:
John W. Linville 2009-08-20 16:34:15 -04:00
parent b0a4e7d8a2
commit 103bf9f7d3
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/net/mac80211.h
View file

@ -1657,12 +1657,6 @@ void ieee80211_free_hw(struct ieee80211_hw *hw);
*/ */
void ieee80211_restart_hw(struct ieee80211_hw *hw); void ieee80211_restart_hw(struct ieee80211_hw *hw);
/*
* trick to avoid symbol clashes with the ieee80211 subsystem,
* use the inline below instead
*/
void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
/** /**
* ieee80211_rx - receive frame * ieee80211_rx - receive frame
* *
@ -1678,10 +1672,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
* @hw: the hardware this frame came in on * @hw: the hardware this frame came in on
* @skb: the buffer to receive, owned by mac80211 after this call * @skb: the buffer to receive, owned by mac80211 after this call
*/ */
static inline void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
{
__ieee80211_rx(hw, skb);
}
/** /**
* ieee80211_rx_irqsafe - receive frame * ieee80211_rx_irqsafe - receive frame

4
net/mac80211/rx.c
View file

@ -2440,7 +2440,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local,
* This is the receive path handler. It is called by a low level driver when an * This is the receive path handler. It is called by a low level driver when an
* 802.11 MPDU is received from the hardware. * 802.11 MPDU is received from the hardware.
*/ */
void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
{ {
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_rate *rate = NULL; struct ieee80211_rate *rate = NULL;
@ -2523,7 +2523,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
rcu_read_unlock(); rcu_read_unlock();
} }
EXPORT_SYMBOL(__ieee80211_rx); EXPORT_SYMBOL(ieee80211_rx);
/* This is a version of the rx handler that can be called from hard irq /* This is a version of the rx handler that can be called from hard irq
* context. Post the skb on the queue and schedule the tasklet */ * context. Post the skb on the queue and schedule the tasklet */