diff options
author | George Kadianakis <desnacked@gmail.com> | 2009-12-16 18:16:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 14:27:46 -0500 |
commit | df574b8ecfb3a84af96229f336a6be88ca4a7055 (patch) | |
tree | 5380c45aa776d728dc81c3e07fbd180e9510fcb5 /drivers/staging/rtl8187se | |
parent | aad445f8ccd554cd3013af7bd0a6cfae599a2505 (diff) |
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')
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211.h | 10 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 14 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/r8180_core.c | 10 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/r8180_wx.c | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index 3222c22152f..0d490c164db 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h | |||
@@ -1318,13 +1318,13 @@ extern int ieee80211_encrypt_fragment( | |||
1318 | struct sk_buff *frag, | 1318 | struct sk_buff *frag, |
1319 | int hdr_len); | 1319 | int hdr_len); |
1320 | 1320 | ||
1321 | extern int ieee80211_xmit(struct sk_buff *skb, | 1321 | extern int ieee80211_rtl_xmit(struct sk_buff *skb, |
1322 | struct net_device *dev); | 1322 | struct net_device *dev); |
1323 | extern void ieee80211_txb_free(struct ieee80211_txb *); | 1323 | extern void ieee80211_txb_free(struct ieee80211_txb *); |
1324 | 1324 | ||
1325 | 1325 | ||
1326 | /* ieee80211_rx.c */ | 1326 | /* ieee80211_rx.c */ |
1327 | extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | 1327 | extern int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, |
1328 | struct ieee80211_rx_stats *rx_stats); | 1328 | struct ieee80211_rx_stats *rx_stats); |
1329 | extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, | 1329 | extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, |
1330 | struct ieee80211_hdr_4addr *header, | 1330 | struct ieee80211_hdr_4addr *header, |
@@ -1376,8 +1376,8 @@ extern void ieee80211_stop_protocol(struct ieee80211_device *ieee); | |||
1376 | extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee); | 1376 | extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee); |
1377 | extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee); | 1377 | extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee); |
1378 | extern void ieee80211_reset_queue(struct ieee80211_device *ieee); | 1378 | extern void ieee80211_reset_queue(struct ieee80211_device *ieee); |
1379 | extern void ieee80211_wake_queue(struct ieee80211_device *ieee); | 1379 | extern void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee); |
1380 | extern void ieee80211_stop_queue(struct ieee80211_device *ieee); | 1380 | extern void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee); |
1381 | extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee); | 1381 | extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee); |
1382 | extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee); | 1382 | extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee); |
1383 | extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee); | 1383 | extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee); |
@@ -1385,7 +1385,7 @@ extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct | |||
1385 | extern void notify_wx_assoc_event(struct ieee80211_device *ieee); | 1385 | extern void notify_wx_assoc_event(struct ieee80211_device *ieee); |
1386 | extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success); | 1386 | extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success); |
1387 | extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn); | 1387 | extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn); |
1388 | extern void ieee80211_start_scan(struct ieee80211_device *ieee); | 1388 | extern void ieee80211_rtl_start_scan(struct ieee80211_device *ieee); |
1389 | 1389 | ||
1390 | //Add for RF power on power off by lizhaoming 080512 | 1390 | //Add for RF power on power off by lizhaoming 080512 |
1391 | extern void SendDisassociation(struct ieee80211_device *ieee, | 1391 | extern void SendDisassociation(struct ieee80211_device *ieee, |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c index f882dd8cf9b..9128c181bc7 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | |||
@@ -469,7 +469,7 @@ drop: | |||
469 | /* All received frames are sent to this function. @skb contains the frame in | 469 | /* All received frames are sent to this function. @skb contains the frame in |
470 | * IEEE 802.11 format, i.e., in the format it was sent over air. | 470 | * IEEE 802.11 format, i.e., in the format it was sent over air. |
471 | * This function is called only as a tasklet (software IRQ). */ | 471 | * This function is called only as a tasklet (software IRQ). */ |
472 | int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | 472 | int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, |
473 | struct ieee80211_rx_stats *rx_stats) | 473 | struct ieee80211_rx_stats *rx_stats) |
474 | { | 474 | { |
475 | struct net_device *dev = ieee->dev; | 475 | struct net_device *dev = ieee->dev; |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 1fe19c39d70..c7c645af0eb 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | |||
@@ -689,7 +689,7 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee) | |||
689 | } | 689 | } |
690 | 690 | ||
691 | /* called with ieee->lock held */ | 691 | /* called with ieee->lock held */ |
692 | void ieee80211_start_scan(struct ieee80211_device *ieee) | 692 | void ieee80211_rtl_start_scan(struct ieee80211_device *ieee) |
693 | { | 693 | { |
694 | if(IS_DOT11D_ENABLE(ieee) ) | 694 | if(IS_DOT11D_ENABLE(ieee) ) |
695 | { | 695 | { |
@@ -1196,7 +1196,7 @@ void ieee80211_associate_step1(struct ieee80211_device *ieee) | |||
1196 | } | 1196 | } |
1197 | } | 1197 | } |
1198 | 1198 | ||
1199 | void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen) | 1199 | void ieee80211_rtl_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen) |
1200 | { | 1200 | { |
1201 | u8 *c; | 1201 | u8 *c; |
1202 | struct sk_buff *skb; | 1202 | struct sk_buff *skb; |
@@ -1898,7 +1898,7 @@ associate_complete: | |||
1898 | 1898 | ||
1899 | ieee80211_associate_step2(ieee); | 1899 | ieee80211_associate_step2(ieee); |
1900 | }else{ | 1900 | }else{ |
1901 | ieee80211_auth_challenge(ieee, challenge, chlen); | 1901 | ieee80211_rtl_auth_challenge(ieee, challenge, chlen); |
1902 | } | 1902 | } |
1903 | }else{ | 1903 | }else{ |
1904 | ieee->softmac_stats.rx_auth_rs_err++; | 1904 | ieee->softmac_stats.rx_auth_rs_err++; |
@@ -2047,7 +2047,7 @@ void ieee80211_reset_queue(struct ieee80211_device *ieee) | |||
2047 | 2047 | ||
2048 | } | 2048 | } |
2049 | 2049 | ||
2050 | void ieee80211_wake_queue(struct ieee80211_device *ieee) | 2050 | void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee) |
2051 | { | 2051 | { |
2052 | 2052 | ||
2053 | unsigned long flags; | 2053 | unsigned long flags; |
@@ -2089,7 +2089,7 @@ exit : | |||
2089 | } | 2089 | } |
2090 | 2090 | ||
2091 | 2091 | ||
2092 | void ieee80211_stop_queue(struct ieee80211_device *ieee) | 2092 | void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee) |
2093 | { | 2093 | { |
2094 | //unsigned long flags; | 2094 | //unsigned long flags; |
2095 | //spin_lock_irqsave(&ieee->lock,flags); | 2095 | //spin_lock_irqsave(&ieee->lock,flags); |
@@ -2301,7 +2301,7 @@ void ieee80211_start_bss(struct ieee80211_device *ieee) | |||
2301 | //#else | 2301 | //#else |
2302 | if (ieee->state == IEEE80211_NOLINK){ | 2302 | if (ieee->state == IEEE80211_NOLINK){ |
2303 | ieee->actscanning = true; | 2303 | ieee->actscanning = true; |
2304 | ieee80211_start_scan(ieee); | 2304 | ieee80211_rtl_start_scan(ieee); |
2305 | } | 2305 | } |
2306 | //#endif | 2306 | //#endif |
2307 | spin_unlock_irqrestore(&ieee->lock, flags); | 2307 | spin_unlock_irqrestore(&ieee->lock, flags); |
@@ -2357,7 +2357,7 @@ void ieee80211_associate_retry_wq(struct work_struct *work) | |||
2357 | if(ieee->state == IEEE80211_NOLINK){ | 2357 | if(ieee->state == IEEE80211_NOLINK){ |
2358 | ieee->beinretry = false; | 2358 | ieee->beinretry = false; |
2359 | ieee->actscanning = true; | 2359 | ieee->actscanning = true; |
2360 | ieee80211_start_scan(ieee); | 2360 | ieee80211_rtl_start_scan(ieee); |
2361 | } | 2361 | } |
2362 | //YJ,add,080828, notify os here | 2362 | //YJ,add,080828, notify os here |
2363 | if(ieee->state == IEEE80211_NOLINK) | 2363 | if(ieee->state == IEEE80211_NOLINK) |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c index dde1f2e0cf3..69bd02164b0 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | |||
@@ -304,7 +304,7 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network) | |||
304 | } | 304 | } |
305 | 305 | ||
306 | /* SKBs are added to the ieee->tx_queue. */ | 306 | /* SKBs are added to the ieee->tx_queue. */ |
307 | int ieee80211_xmit(struct sk_buff *skb, | 307 | int ieee80211_rtl_xmit(struct sk_buff *skb, |
308 | struct net_device *dev) | 308 | struct net_device *dev) |
309 | { | 309 | { |
310 | struct ieee80211_device *ieee = netdev_priv(dev); | 310 | struct ieee80211_device *ieee = netdev_priv(dev); |
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 57c62b0a402..e0f13efdb15 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c | |||
@@ -1811,7 +1811,7 @@ void rtl8180_rx(struct net_device *dev) | |||
1811 | if(priv->rx_skb->len > 4) | 1811 | if(priv->rx_skb->len > 4) |
1812 | skb_trim(priv->rx_skb,priv->rx_skb->len-4); | 1812 | skb_trim(priv->rx_skb,priv->rx_skb->len-4); |
1813 | #ifndef RX_DONT_PASS_UL | 1813 | #ifndef RX_DONT_PASS_UL |
1814 | if(!ieee80211_rx(priv->ieee80211, | 1814 | if(!ieee80211_rtl_rx(priv->ieee80211, |
1815 | priv->rx_skb, &stats)){ | 1815 | priv->rx_skb, &stats)){ |
1816 | #endif // RX_DONT_PASS_UL | 1816 | #endif // RX_DONT_PASS_UL |
1817 | 1817 | ||
@@ -1917,11 +1917,11 @@ rate) | |||
1917 | if (!check_nic_enought_desc(dev, priority)){ | 1917 | if (!check_nic_enought_desc(dev, priority)){ |
1918 | DMESGW("Error: no descriptor left by previous TX (avail %d) ", | 1918 | DMESGW("Error: no descriptor left by previous TX (avail %d) ", |
1919 | get_curr_tx_free_desc(dev, priority)); | 1919 | get_curr_tx_free_desc(dev, priority)); |
1920 | ieee80211_stop_queue(priv->ieee80211); | 1920 | ieee80211_rtl_stop_queue(priv->ieee80211); |
1921 | } | 1921 | } |
1922 | rtl8180_tx(dev, skb->data, skb->len, priority, morefrag,0,rate); | 1922 | rtl8180_tx(dev, skb->data, skb->len, priority, morefrag,0,rate); |
1923 | if (!check_nic_enought_desc(dev, priority)) | 1923 | if (!check_nic_enought_desc(dev, priority)) |
1924 | ieee80211_stop_queue(priv->ieee80211); | 1924 | ieee80211_rtl_stop_queue(priv->ieee80211); |
1925 | 1925 | ||
1926 | spin_unlock_irqrestore(&priv->tx_lock,flags); | 1926 | spin_unlock_irqrestore(&priv->tx_lock,flags); |
1927 | } | 1927 | } |
@@ -3680,7 +3680,7 @@ static const struct net_device_ops rtl8180_netdev_ops = { | |||
3680 | .ndo_set_mac_address = r8180_set_mac_adr, | 3680 | .ndo_set_mac_address = r8180_set_mac_adr, |
3681 | .ndo_validate_addr = eth_validate_addr, | 3681 | .ndo_validate_addr = eth_validate_addr, |
3682 | .ndo_change_mtu = eth_change_mtu, | 3682 | .ndo_change_mtu = eth_change_mtu, |
3683 | .ndo_start_xmit = ieee80211_xmit, | 3683 | .ndo_start_xmit = ieee80211_rtl_xmit, |
3684 | }; | 3684 | }; |
3685 | 3685 | ||
3686 | static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, | 3686 | static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, |
@@ -3900,7 +3900,7 @@ void rtl8180_try_wake_queue(struct net_device *dev, int pri) | |||
3900 | spin_unlock_irqrestore(&priv->tx_lock,flags); | 3900 | spin_unlock_irqrestore(&priv->tx_lock,flags); |
3901 | 3901 | ||
3902 | if(enough_desc) | 3902 | if(enough_desc) |
3903 | ieee80211_wake_queue(priv->ieee80211); | 3903 | ieee80211_rtl_wake_queue(priv->ieee80211); |
3904 | } | 3904 | } |
3905 | 3905 | ||
3906 | void rtl8180_tx_isr(struct net_device *dev, int pri,short error) | 3906 | void rtl8180_tx_isr(struct net_device *dev, int pri,short error) |
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index 536cb6e8e79..124cde356cb 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, | |||
377 | // queue_work(priv->ieee80211->wq, &priv->ieee80211->wx_sync_scan_wq); | 377 | // queue_work(priv->ieee80211->wq, &priv->ieee80211->wx_sync_scan_wq); |
378 | //printk("start scan============================>\n"); | 378 | //printk("start scan============================>\n"); |
379 | ieee80211_softmac_ips_scan_syncro(priv->ieee80211); | 379 | ieee80211_softmac_ips_scan_syncro(priv->ieee80211); |
380 | //ieee80211_start_scan(priv->ieee80211); | 380 | //ieee80211_rtl_start_scan(priv->ieee80211); |
381 | /* intentionally forget to up sem */ | 381 | /* intentionally forget to up sem */ |
382 | // up(&priv->ieee80211->wx_sem); | 382 | // up(&priv->ieee80211->wx_sem); |
383 | ret = 0; | 383 | ret = 0; |