diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-08-20 16:34:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:29 -0400 |
| commit | 103bf9f7d35849bce52ad412e4da5063b0716969 (patch) | |
| tree | 67712138dc332cc42f3cc69ab2db9dbb60b4b4e1 /include/net | |
| parent | b0a4e7d8a291de63f35b04464de9ab4a83d38a7c (diff) | |
| download | linux-103bf9f7d35849bce52ad412e4da5063b0716969.tar.bz2 | |
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 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index aac84d7bd46e..466859b285e1 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1657,12 +1657,6 @@ void ieee80211_free_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 * @@ -1678,10 +1672,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb); * @hw: the hardware this frame came in on * @skb: the buffer to receive, owned by mac80211 after this call */ -static inline void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) -{ - __ieee80211_rx(hw, skb); -} +void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb); /** * ieee80211_rx_irqsafe - receive frame |