Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 15:11:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: fix rtl8187se compilation errors with mac80211

Browse Source 
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>
This commit is contained in:
George Kadianakis 2009-12-17 01:16:00 +02:00 committed by Greg Kroah-Hartman
parent aad445f8cc
commit df574b8ecf
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/rtl8187se/ieee80211/ieee80211.h
View File

@ -1318,13 +1318,13 @@ extern int ieee80211_encrypt_fragment(
struct sk_buff *frag, struct sk_buff *frag,
int hdr_len); int hdr_len);
extern int ieee80211_xmit(struct sk_buff *skb, extern int ieee80211_rtl_xmit(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
extern void ieee80211_txb_free(struct ieee80211_txb *); extern void ieee80211_txb_free(struct ieee80211_txb *);
/* ieee80211_rx.c */ /* ieee80211_rx.c */
extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, extern int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
struct ieee80211_rx_stats *rx_stats); struct ieee80211_rx_stats *rx_stats);
extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
struct ieee80211_hdr_4addr *header, struct ieee80211_hdr_4addr *header,
@ -1376,8 +1376,8 @@ extern void ieee80211_stop_protocol(struct ieee80211_device *ieee);
extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee); extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);
extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee); extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);
extern void ieee80211_reset_queue(struct ieee80211_device *ieee); extern void ieee80211_reset_queue(struct ieee80211_device *ieee);
extern void ieee80211_wake_queue(struct ieee80211_device *ieee); extern void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee);
extern void ieee80211_stop_queue(struct ieee80211_device *ieee); extern void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee);
extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee); extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);
extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee); extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);
extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee); 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
extern void notify_wx_assoc_event(struct ieee80211_device *ieee); extern void notify_wx_assoc_event(struct ieee80211_device *ieee);
extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success); extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn); extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn);
extern void ieee80211_start_scan(struct ieee80211_device *ieee); extern void ieee80211_rtl_start_scan(struct ieee80211_device *ieee);
//Add for RF power on power off by lizhaoming 080512 //Add for RF power on power off by lizhaoming 080512
extern void SendDisassociation(struct ieee80211_device *ieee, extern void SendDisassociation(struct ieee80211_device *ieee,

2
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
View File

@ -469,7 +469,7 @@ drop:
/* All received frames are sent to this function. @skb contains the frame in /* 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. * IEEE 802.11 format, i.e., in the format it was sent over air.
* This function is called only as a tasklet (software IRQ). */ * 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 ieee80211_rx_stats *rx_stats)
{ {
struct net_device *dev = ieee->dev; struct net_device *dev = ieee->dev;

14
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
View File

@ -689,7 +689,7 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee)
} }
/* called with ieee->lock held */ /* called with ieee->lock held */
void ieee80211_start_scan(struct ieee80211_device *ieee) void ieee80211_rtl_start_scan(struct ieee80211_device *ieee)
{ {
if(IS_DOT11D_ENABLE(ieee) ) if(IS_DOT11D_ENABLE(ieee) )
{ {
@ -1196,7 +1196,7 @@ void ieee80211_associate_step1(struct ieee80211_device *ieee)
} }
} }
void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen) void ieee80211_rtl_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen)
{ {
u8 *c; u8 *c;
struct sk_buff *skb; struct sk_buff *skb;
@ -1898,7 +1898,7 @@ associate_complete:
ieee80211_associate_step2(ieee); ieee80211_associate_step2(ieee);
}else{ }else{
ieee80211_auth_challenge(ieee, challenge, chlen); ieee80211_rtl_auth_challenge(ieee, challenge, chlen);
} }
}else{ }else{
ieee->softmac_stats.rx_auth_rs_err++; ieee->softmac_stats.rx_auth_rs_err++;
@ -2047,7 +2047,7 @@ void ieee80211_reset_queue(struct ieee80211_device *ieee)
} }
void ieee80211_wake_queue(struct ieee80211_device *ieee) void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee)
{ {
unsigned long flags; unsigned long flags;
@ -2089,7 +2089,7 @@ exit :
} }
void ieee80211_stop_queue(struct ieee80211_device *ieee) void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee)
{ {
//unsigned long flags; //unsigned long flags;
//spin_lock_irqsave(&ieee->lock,flags); //spin_lock_irqsave(&ieee->lock,flags);
@ -2301,7 +2301,7 @@ void ieee80211_start_bss(struct ieee80211_device *ieee)
//#else //#else
if (ieee->state == IEEE80211_NOLINK){ if (ieee->state == IEEE80211_NOLINK){
ieee->actscanning = true; ieee->actscanning = true;
ieee80211_start_scan(ieee); ieee80211_rtl_start_scan(ieee);
} }
//#endif //#endif
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
@ -2357,7 +2357,7 @@ void ieee80211_associate_retry_wq(struct work_struct *work)
if(ieee->state == IEEE80211_NOLINK){ if(ieee->state == IEEE80211_NOLINK){
ieee->beinretry = false; ieee->beinretry = false;
ieee->actscanning = true; ieee->actscanning = true;
ieee80211_start_scan(ieee); ieee80211_rtl_start_scan(ieee);
} }
//YJ,add,080828, notify os here //YJ,add,080828, notify os here
if(ieee->state == IEEE80211_NOLINK) if(ieee->state == IEEE80211_NOLINK)

2
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
View File

@ -304,7 +304,7 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)
} }
/* SKBs are added to the ieee->tx_queue. */ /* SKBs are added to the ieee->tx_queue. */
int ieee80211_xmit(struct sk_buff *skb, int ieee80211_rtl_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);

10
drivers/staging/rtl8187se/r8180_core.c
View File

@ -1811,7 +1811,7 @@ void rtl8180_rx(struct net_device *dev)
if(priv->rx_skb->len > 4) if(priv->rx_skb->len > 4)
skb_trim(priv->rx_skb,priv->rx_skb->len-4); skb_trim(priv->rx_skb,priv->rx_skb->len-4);
#ifndef RX_DONT_PASS_UL #ifndef RX_DONT_PASS_UL
if(!ieee80211_rx(priv->ieee80211, if(!ieee80211_rtl_rx(priv->ieee80211,
priv->rx_skb, &stats)){ priv->rx_skb, &stats)){
#endif // RX_DONT_PASS_UL #endif // RX_DONT_PASS_UL
@ -1917,11 +1917,11 @@ rate)
if (!check_nic_enought_desc(dev, priority)){ if (!check_nic_enought_desc(dev, priority)){
DMESGW("Error: no descriptor left by previous TX (avail %d) ", DMESGW("Error: no descriptor left by previous TX (avail %d) ",
get_curr_tx_free_desc(dev, priority)); get_curr_tx_free_desc(dev, priority));
ieee80211_stop_queue(priv->ieee80211); ieee80211_rtl_stop_queue(priv->ieee80211);
} }
rtl8180_tx(dev, skb->data, skb->len, priority, morefrag,0,rate); rtl8180_tx(dev, skb->data, skb->len, priority, morefrag,0,rate);
if (!check_nic_enought_desc(dev, priority)) if (!check_nic_enought_desc(dev, priority))
ieee80211_stop_queue(priv->ieee80211); ieee80211_rtl_stop_queue(priv->ieee80211);
spin_unlock_irqrestore(&priv->tx_lock,flags); spin_unlock_irqrestore(&priv->tx_lock,flags);
} }
@ -3680,7 +3680,7 @@ static const struct net_device_ops rtl8180_netdev_ops = {
.ndo_set_mac_address = r8180_set_mac_adr, .ndo_set_mac_address = r8180_set_mac_adr,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_change_mtu = eth_change_mtu, .ndo_change_mtu = eth_change_mtu,
.ndo_start_xmit = ieee80211_xmit, .ndo_start_xmit = ieee80211_rtl_xmit,
}; };
static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, 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)
spin_unlock_irqrestore(&priv->tx_lock,flags); spin_unlock_irqrestore(&priv->tx_lock,flags);
if(enough_desc) if(enough_desc)
ieee80211_wake_queue(priv->ieee80211); ieee80211_rtl_wake_queue(priv->ieee80211);
} }
void rtl8180_tx_isr(struct net_device *dev, int pri,short error) void rtl8180_tx_isr(struct net_device *dev, int pri,short error)

2
drivers/staging/rtl8187se/r8180_wx.c
View File

@ -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); // queue_work(priv->ieee80211->wq, &priv->ieee80211->wx_sync_scan_wq);
//printk("start scan============================>\n"); //printk("start scan============================>\n");
ieee80211_softmac_ips_scan_syncro(priv->ieee80211); ieee80211_softmac_ips_scan_syncro(priv->ieee80211);
//ieee80211_start_scan(priv->ieee80211); //ieee80211_rtl_start_scan(priv->ieee80211);
/* intentionally forget to up sem */ /* intentionally forget to up sem */
// up(&priv->ieee80211->wx_sem); // up(&priv->ieee80211->wx_sem);
ret = 0; ret = 0;