]>
Commit | Line | Data |
---|---|---|
c7880ca6 GKH |
1 | From df574b8ecfb3a84af96229f336a6be88ca4a7055 Mon Sep 17 00:00:00 2001 |
2 | From: George Kadianakis <desnacked@gmail.com> | |
3 | Date: Thu, 17 Dec 2009 01:16:00 +0200 | |
4 | Subject: Staging: fix rtl8187se compilation errors with mac80211 | |
5 | ||
6 | From: George Kadianakis <desnacked@gmail.com> | |
7 | ||
8 | commit df574b8ecfb3a84af96229f336a6be88ca4a7055 upstream. | |
9 | ||
10 | This patch fixes compilation problems that were caused by function | |
11 | naming conflicts between the rtl8187se driver and the mac80211 stack. | |
12 | ||
cbf0bd32 | 13 | Signed-off-by: George Kadianakis <desnacked@gmail.com> |
c7880ca6 GKH |
14 | Cc: maximilian attems <max@stro.at> |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
16 | ||
17 | --- | |
18 | drivers/staging/rtl8187se/ieee80211/ieee80211.h | 10 +++++----- | |
19 | drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- | |
20 | drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 14 +++++++------- | |
21 | drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 2 +- | |
22 | drivers/staging/rtl8187se/r8180_core.c | 10 +++++----- | |
23 | drivers/staging/rtl8187se/r8180_wx.c | 2 +- | |
24 | 6 files changed, 20 insertions(+), 20 deletions(-) | |
25 | ||
26 | --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h | |
27 | +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h | |
28 | @@ -1318,13 +1318,13 @@ extern int ieee80211_encrypt_fragment( | |
29 | struct sk_buff *frag, | |
30 | int hdr_len); | |
31 | ||
32 | -extern int ieee80211_xmit(struct sk_buff *skb, | |
33 | +extern int ieee80211_rtl_xmit(struct sk_buff *skb, | |
34 | struct net_device *dev); | |
35 | extern void ieee80211_txb_free(struct ieee80211_txb *); | |
36 | ||
37 | ||
38 | /* ieee80211_rx.c */ | |
39 | -extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |
40 | +extern int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |
41 | struct ieee80211_rx_stats *rx_stats); | |
42 | extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, | |
43 | struct ieee80211_hdr_4addr *header, | |
44 | @@ -1376,8 +1376,8 @@ extern void ieee80211_stop_protocol(stru | |
45 | extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee); | |
46 | extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee); | |
47 | extern void ieee80211_reset_queue(struct ieee80211_device *ieee); | |
48 | -extern void ieee80211_wake_queue(struct ieee80211_device *ieee); | |
49 | -extern void ieee80211_stop_queue(struct ieee80211_device *ieee); | |
50 | +extern void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee); | |
51 | +extern void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee); | |
52 | extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee); | |
53 | extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee); | |
54 | extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee); | |
55 | @@ -1385,7 +1385,7 @@ extern int ieee80211_wpa_supplicant_ioct | |
56 | extern void notify_wx_assoc_event(struct ieee80211_device *ieee); | |
57 | extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success); | |
58 | extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn); | |
59 | -extern void ieee80211_start_scan(struct ieee80211_device *ieee); | |
60 | +extern void ieee80211_rtl_start_scan(struct ieee80211_device *ieee); | |
61 | ||
62 | //Add for RF power on power off by lizhaoming 080512 | |
63 | extern void SendDisassociation(struct ieee80211_device *ieee, | |
64 | --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | |
65 | +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | |
66 | @@ -470,7 +470,7 @@ drop: | |
67 | /* All received frames are sent to this function. @skb contains the frame in | |
68 | * IEEE 802.11 format, i.e., in the format it was sent over air. | |
69 | * This function is called only as a tasklet (software IRQ). */ | |
70 | -int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |
71 | +int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |
72 | struct ieee80211_rx_stats *rx_stats) | |
73 | { | |
74 | struct net_device *dev = ieee->dev; | |
75 | --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | |
76 | +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | |
77 | @@ -689,7 +689,7 @@ void ieee80211_stop_scan(struct ieee8021 | |
78 | } | |
79 | ||
80 | /* called with ieee->lock held */ | |
81 | -void ieee80211_start_scan(struct ieee80211_device *ieee) | |
82 | +void ieee80211_rtl_start_scan(struct ieee80211_device *ieee) | |
83 | { | |
84 | if(IS_DOT11D_ENABLE(ieee) ) | |
85 | { | |
86 | @@ -1196,7 +1196,7 @@ void ieee80211_associate_step1(struct ie | |
87 | } | |
88 | } | |
89 | ||
90 | -void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen) | |
91 | +void ieee80211_rtl_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen) | |
92 | { | |
93 | u8 *c; | |
94 | struct sk_buff *skb; | |
95 | @@ -1898,7 +1898,7 @@ associate_complete: | |
96 | ||
97 | ieee80211_associate_step2(ieee); | |
98 | }else{ | |
99 | - ieee80211_auth_challenge(ieee, challenge, chlen); | |
100 | + ieee80211_rtl_auth_challenge(ieee, challenge, chlen); | |
101 | } | |
102 | }else{ | |
103 | ieee->softmac_stats.rx_auth_rs_err++; | |
104 | @@ -2047,7 +2047,7 @@ void ieee80211_reset_queue(struct ieee80 | |
105 | ||
106 | } | |
107 | ||
108 | -void ieee80211_wake_queue(struct ieee80211_device *ieee) | |
109 | +void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee) | |
110 | { | |
111 | ||
112 | unsigned long flags; | |
113 | @@ -2089,7 +2089,7 @@ exit : | |
114 | } | |
115 | ||
116 | ||
117 | -void ieee80211_stop_queue(struct ieee80211_device *ieee) | |
118 | +void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee) | |
119 | { | |
120 | //unsigned long flags; | |
121 | //spin_lock_irqsave(&ieee->lock,flags); | |
122 | @@ -2301,7 +2301,7 @@ void ieee80211_start_bss(struct ieee8021 | |
123 | //#else | |
124 | if (ieee->state == IEEE80211_NOLINK){ | |
125 | ieee->actscanning = true; | |
126 | - ieee80211_start_scan(ieee); | |
127 | + ieee80211_rtl_start_scan(ieee); | |
128 | } | |
129 | //#endif | |
130 | spin_unlock_irqrestore(&ieee->lock, flags); | |
131 | @@ -2357,7 +2357,7 @@ void ieee80211_associate_retry_wq(struct | |
132 | if(ieee->state == IEEE80211_NOLINK){ | |
133 | ieee->beinretry = false; | |
134 | ieee->actscanning = true; | |
135 | - ieee80211_start_scan(ieee); | |
136 | + ieee80211_rtl_start_scan(ieee); | |
137 | } | |
138 | //YJ,add,080828, notify os here | |
139 | if(ieee->state == IEEE80211_NOLINK) | |
140 | --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | |
141 | +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | |
142 | @@ -305,7 +305,7 @@ ieee80211_classify(struct sk_buff *skb, | |
143 | } | |
144 | ||
145 | /* SKBs are added to the ieee->tx_queue. */ | |
146 | -int ieee80211_xmit(struct sk_buff *skb, | |
147 | +int ieee80211_rtl_xmit(struct sk_buff *skb, | |
148 | struct net_device *dev) | |
149 | { | |
150 | struct ieee80211_device *ieee = netdev_priv(dev); | |
151 | --- a/drivers/staging/rtl8187se/r8180_core.c | |
152 | +++ b/drivers/staging/rtl8187se/r8180_core.c | |
153 | @@ -1830,7 +1830,7 @@ void rtl8180_rx(struct net_device *dev) | |
154 | if(priv->rx_skb->len > 4) | |
155 | skb_trim(priv->rx_skb,priv->rx_skb->len-4); | |
156 | #ifndef RX_DONT_PASS_UL | |
157 | - if(!ieee80211_rx(priv->ieee80211, | |
158 | + if(!ieee80211_rtl_rx(priv->ieee80211, | |
159 | priv->rx_skb, &stats)){ | |
160 | #endif // RX_DONT_PASS_UL | |
161 | ||
162 | @@ -1936,11 +1936,11 @@ rate) | |
163 | if (!check_nic_enought_desc(dev, priority)){ | |
164 | DMESGW("Error: no descriptor left by previous TX (avail %d) ", | |
165 | get_curr_tx_free_desc(dev, priority)); | |
166 | - ieee80211_stop_queue(priv->ieee80211); | |
167 | + ieee80211_rtl_stop_queue(priv->ieee80211); | |
168 | } | |
169 | rtl8180_tx(dev, skb->data, skb->len, priority, morefrag,0,rate); | |
170 | if (!check_nic_enought_desc(dev, priority)) | |
171 | - ieee80211_stop_queue(priv->ieee80211); | |
172 | + ieee80211_rtl_stop_queue(priv->ieee80211); | |
173 | ||
174 | spin_unlock_irqrestore(&priv->tx_lock,flags); | |
175 | } | |
176 | @@ -3846,7 +3846,7 @@ static const struct net_device_ops rtl81 | |
177 | .ndo_set_mac_address = r8180_set_mac_adr, | |
178 | .ndo_validate_addr = eth_validate_addr, | |
179 | .ndo_change_mtu = eth_change_mtu, | |
180 | - .ndo_start_xmit = ieee80211_xmit, | |
181 | + .ndo_start_xmit = ieee80211_rtl_xmit, | |
182 | }; | |
183 | ||
184 | static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, | |
185 | @@ -4066,7 +4066,7 @@ void rtl8180_try_wake_queue(struct net_d | |
186 | spin_unlock_irqrestore(&priv->tx_lock,flags); | |
187 | ||
188 | if(enough_desc) | |
189 | - ieee80211_wake_queue(priv->ieee80211); | |
190 | + ieee80211_rtl_wake_queue(priv->ieee80211); | |
191 | } | |
192 | ||
193 | void rtl8180_tx_isr(struct net_device *dev, int pri,short error) | |
194 | --- a/drivers/staging/rtl8187se/r8180_wx.c | |
195 | +++ b/drivers/staging/rtl8187se/r8180_wx.c | |
196 | @@ -377,7 +377,7 @@ static int r8180_wx_set_scan(struct net_ | |
197 | // queue_work(priv->ieee80211->wq, &priv->ieee80211->wx_sync_scan_wq); | |
198 | //printk("start scan============================>\n"); | |
199 | ieee80211_softmac_ips_scan_syncro(priv->ieee80211); | |
200 | -//ieee80211_start_scan(priv->ieee80211); | |
201 | +//ieee80211_rtl_start_scan(priv->ieee80211); | |
202 | /* intentionally forget to up sem */ | |
203 | // up(&priv->ieee80211->wx_sem); | |
204 | ret = 0; |