diff options
author | George Kadianakis <desnacked@gmail.com> | 2009-12-17 01:18:08 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 11:27:46 -0800 |
commit | fb5fe2776d1e2a0645d8aa3286a1d5ddd95b0723 (patch) | |
tree | 354a356d0c2f1d79d16d6cc89931ee135a770cbb /drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | |
parent | df574b8ecfb3a84af96229f336a6be88ca4a7055 (diff) |
staging: fix rtl8192e compilation errors with mac80211
This patch series fixes compilation problems that were caused by
function naming conflicts between the rtl8192e driver and the
mac80211 stack.
Signed-off-by: George Kadianakis <desnacked at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c')
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c index 103b33c093f..798fb4154c2 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c @@ -604,7 +604,7 @@ void ieee80211_query_seqnum(struct ieee80211_device*ieee, struct sk_buff* skb, u } } -int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) +int ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) struct ieee80211_device *ieee = netdev_priv(dev); |