diff options
| author | George Kadianakis <desnacked@gmail.com> | 2009-12-16 23:16:00 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 19:27:46 (GMT) |
| commit | df574b8ecfb3a84af96229f336a6be88ca4a7055 (patch) | |
| tree | 5380c45aa776d728dc81c3e07fbd180e9510fcb5 /drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | |
| parent | aad445f8ccd554cd3013af7bd0a6cfae599a2505 (diff) | |
| download | linux-fsl-qoriq-df574b8ecfb3a84af96229f336a6be88ca4a7055.tar.xz | |
Staging: fix rtl8187se compilation errors with mac80211
This patch fixes compilation problems that were caused by function
naming conflicts between the rtl8187se 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/rtl8187se/ieee80211/ieee80211_rx.c')
| -rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c index f882dd8..9128c18 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c @@ -469,7 +469,7 @@ drop: /* All received frames are sent to this function. @skb contains the frame in * IEEE 802.11 format, i.e., in the format it was sent over air. * This function is called only as a tasklet (software IRQ). */ -int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, +int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats) { struct net_device *dev = ieee->dev; |