diff options
| author | George Kadianakis <desnacked@gmail.com> | 2009-12-17 01:16:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 11:27:46 -0800 |
| commit | df574b8ecfb3a84af96229f336a6be88ca4a7055 (patch) | |
| tree | 5380c45aa776d728dc81c3e07fbd180e9510fcb5 /drivers/staging/rtl8187se/r8180_wx.c | |
| parent | aad445f8ccd554cd3013af7bd0a6cfae599a2505 (diff) | |
| download | op-kernel-dev-df574b8ecfb3a84af96229f336a6be88ca4a7055.zip op-kernel-dev-df574b8ecfb3a84af96229f336a6be88ca4a7055.tar.gz | |
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/r8180_wx.c')
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index 536cb6e..124cde3 100644 --- a/drivers/staging/rtl8187se/r8180_wx.c +++ b/drivers/staging/rtl8187se/r8180_wx.c @@ -377,7 +377,7 @@ static int r8180_wx_set_scan(struct net_device *dev, struct iw_request_info *a, // queue_work(priv->ieee80211->wq, &priv->ieee80211->wx_sync_scan_wq); //printk("start scan============================>\n"); ieee80211_softmac_ips_scan_syncro(priv->ieee80211); -//ieee80211_start_scan(priv->ieee80211); +//ieee80211_rtl_start_scan(priv->ieee80211); /* intentionally forget to up sem */ // up(&priv->ieee80211->wx_sem); ret = 0; |
