Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: rtl8187se: ieee80211: ieee80211_softmac.c: mark symbols as static

Fix sparse warnings for undeclared symbols not marked static like:
148:6: warning: symbol 'enqueue_mgmt' was not declared. Should it be static?
166:16: warning: symbol 'dequeue_mgmt' was not declared. Should it be static?

Signed-off-by: Anmol Sarma <me@anmolsarma.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Anmol Sarma and committed by
Greg Kroah-Hartman
be0162f3 1af1275d

+37 -37
+37 -37
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
··· 47 47 * tag and the EXTENDED RATE MFIE tag if needed. 48 48 * It encludes two bytes per tag for the tag itself and its len 49 49 */ 50 - unsigned int ieee80211_MFIE_rate_len(struct ieee80211_device *ieee) 50 + static unsigned int ieee80211_MFIE_rate_len(struct ieee80211_device *ieee) 51 51 { 52 52 unsigned int rate_len = 0; 53 53 ··· 65 65 * Then it updates the pointer so that 66 66 * it points after the new MFIE tag added. 67 67 */ 68 - void ieee80211_MFIE_Brate(struct ieee80211_device *ieee, u8 **tag_p) 68 + static void ieee80211_MFIE_Brate(struct ieee80211_device *ieee, u8 **tag_p) 69 69 { 70 70 u8 *tag = *tag_p; 71 71 ··· 82 82 *tag_p = tag; 83 83 } 84 84 85 - void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p) 85 + static void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p) 86 86 { 87 87 u8 *tag = *tag_p; 88 88 ··· 106 106 } 107 107 108 108 109 - void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p) 109 + static void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p) 110 110 { 111 111 u8 *tag = *tag_p; 112 112 ··· 129 129 *tag_p = tag; 130 130 } 131 131 132 - void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) 132 + static void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) 133 133 { 134 134 u8 *tag = *tag_p; 135 135 *tag++ = MFIE_TYPE_GENERIC; /* 0 */ ··· 145 145 printk(KERN_ALERT "This is enable turbo mode IE process\n"); 146 146 } 147 147 148 - void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb) 148 + static void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb) 149 149 { 150 150 int nh; 151 151 nh = (ieee->mgmt_queue_head +1) % MGMT_QUEUE_NUM; ··· 163 163 //return 0; 164 164 } 165 165 166 - struct sk_buff *dequeue_mgmt(struct ieee80211_device *ieee) 166 + static struct sk_buff *dequeue_mgmt(struct ieee80211_device *ieee) 167 167 { 168 168 struct sk_buff *ret; 169 169 ··· 178 178 return ret; 179 179 } 180 180 181 - void init_mgmt_queue(struct ieee80211_device *ieee) 181 + static void init_mgmt_queue(struct ieee80211_device *ieee) 182 182 { 183 183 ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0; 184 184 } ··· 374 374 //spin_unlock_irqrestore(&ieee->beacon_lock,flags); 375 375 } 376 376 377 - void ieee80211_send_beacon(struct ieee80211_device *ieee) 377 + static void ieee80211_send_beacon(struct ieee80211_device *ieee) 378 378 { 379 379 struct sk_buff *skb; 380 380 ··· 399 399 } 400 400 401 401 402 - void ieee80211_send_beacon_cb(unsigned long _ieee) 402 + static void ieee80211_send_beacon_cb(unsigned long _ieee) 403 403 { 404 404 struct ieee80211_device *ieee = 405 405 (struct ieee80211_device *) _ieee; ··· 410 410 spin_unlock_irqrestore(&ieee->beacon_lock, flags); 411 411 } 412 412 413 - void ieee80211_send_probe(struct ieee80211_device *ieee) 413 + static void ieee80211_send_probe(struct ieee80211_device *ieee) 414 414 { 415 415 struct sk_buff *skb; 416 416 ··· 422 422 } 423 423 } 424 424 425 - void ieee80211_send_probe_requests(struct ieee80211_device *ieee) 425 + static void ieee80211_send_probe_requests(struct ieee80211_device *ieee) 426 426 { 427 427 if (ieee->active_scan && (ieee->softmac_features & IEEE_SOFTMAC_PROBERQ)){ 428 428 ieee80211_send_probe(ieee); ··· 433 433 /* this performs syncro scan blocking the caller until all channels 434 434 * in the allowed channel map has been checked. 435 435 */ 436 - void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) 436 + static void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee) 437 437 { 438 438 short ch = 0; 439 439 u8 channel_map[MAX_CHANNEL_NUMBER+1]; ··· 571 571 DOT11D_ScanComplete(ieee); 572 572 } 573 573 574 - void ieee80211_softmac_scan_wq(struct work_struct *work) 574 + static void ieee80211_softmac_scan_wq(struct work_struct *work) 575 575 { 576 576 struct delayed_work *dwork = to_delayed_work(work); 577 577 struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq); ··· 614 614 return; 615 615 } 616 616 617 - void ieee80211_beacons_start(struct ieee80211_device *ieee) 617 + static void ieee80211_beacons_start(struct ieee80211_device *ieee) 618 618 { 619 619 unsigned long flags; 620 620 ··· 626 626 spin_unlock_irqrestore(&ieee->beacon_lock,flags); 627 627 } 628 628 629 - void ieee80211_beacons_stop(struct ieee80211_device *ieee) 629 + static void ieee80211_beacons_stop(struct ieee80211_device *ieee) 630 630 { 631 631 unsigned long flags; 632 632 ··· 658 658 } 659 659 660 660 661 - void ieee80211_softmac_stop_scan(struct ieee80211_device *ieee) 661 + static void ieee80211_softmac_stop_scan(struct ieee80211_device *ieee) 662 662 { 663 663 // unsigned long flags; 664 664 ··· 966 966 967 967 } 968 968 969 - struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee, short pwr) 969 + static struct sk_buff *ieee80211_null_func(struct ieee80211_device *ieee, short pwr) 970 970 { 971 971 struct sk_buff *skb; 972 972 struct ieee80211_hdr_3addr* hdr; ··· 992 992 } 993 993 994 994 995 - void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest) 995 + static void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8 *dest) 996 996 { 997 997 struct sk_buff *buf = ieee80211_assoc_resp(ieee, dest); 998 998 ··· 1003 1003 } 1004 1004 1005 1005 1006 - void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s, u8 *dest) 1006 + static void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s, u8 *dest) 1007 1007 { 1008 1008 struct sk_buff *buf = ieee80211_auth_resp(ieee, s, dest); 1009 1009 ··· 1014 1014 } 1015 1015 1016 1016 1017 - void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest) 1017 + static void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest) 1018 1018 { 1019 1019 1020 1020 struct sk_buff *buf = ieee80211_probe_resp(ieee, dest); ··· 1163 1163 spin_unlock_irqrestore(&ieee->lock, flags); 1164 1164 } 1165 1165 1166 - void ieee80211_associate_abort_cb(unsigned long dev) 1166 + static void ieee80211_associate_abort_cb(unsigned long dev) 1167 1167 { 1168 1168 ieee80211_associate_abort((struct ieee80211_device *) dev); 1169 1169 } 1170 1170 1171 1171 1172 - void ieee80211_associate_step1(struct ieee80211_device *ieee) 1172 + static void ieee80211_associate_step1(struct ieee80211_device *ieee) 1173 1173 { 1174 1174 struct ieee80211_network *beacon = &ieee->current_network; 1175 1175 struct sk_buff *skb; ··· 1199 1199 } 1200 1200 } 1201 1201 1202 - void ieee80211_rtl_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, 1202 + static void ieee80211_rtl_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, 1203 1203 int chlen) 1204 1204 { 1205 1205 u8 *c; ··· 1234 1234 kfree(challenge); 1235 1235 } 1236 1236 1237 - void ieee80211_associate_step2(struct ieee80211_device *ieee) 1237 + static void ieee80211_associate_step2(struct ieee80211_device *ieee) 1238 1238 { 1239 1239 struct sk_buff* skb; 1240 1240 struct ieee80211_network *beacon = &ieee->current_network; ··· 1256 1256 } 1257 1257 } 1258 1258 1259 - void ieee80211_associate_complete_wq(struct work_struct *work) 1259 + static void ieee80211_associate_complete_wq(struct work_struct *work) 1260 1260 { 1261 1261 struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq); 1262 1262 ··· 1277 1277 netif_carrier_on(ieee->dev); 1278 1278 } 1279 1279 1280 - void ieee80211_associate_complete(struct ieee80211_device *ieee) 1280 + static void ieee80211_associate_complete(struct ieee80211_device *ieee) 1281 1281 { 1282 1282 int i; 1283 1283 del_timer_sync(&ieee->associate_timer); ··· 1291 1291 queue_work(ieee->wq, &ieee->associate_complete_wq); 1292 1292 } 1293 1293 1294 - void ieee80211_associate_procedure_wq(struct work_struct *work) 1294 + static void ieee80211_associate_procedure_wq(struct work_struct *work) 1295 1295 { 1296 1296 struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_procedure_wq); 1297 1297 ··· 1450 1450 } 1451 1451 1452 1452 1453 - int auth_rq_parse(struct sk_buff *skb, u8 *dest) 1453 + static int auth_rq_parse(struct sk_buff *skb, u8 *dest) 1454 1454 { 1455 1455 struct ieee80211_authentication *a; 1456 1456 ··· 1507 1507 1508 1508 } 1509 1509 1510 - int assoc_rq_parse(struct sk_buff *skb, u8 *dest) 1510 + static int assoc_rq_parse(struct sk_buff *skb, u8 *dest) 1511 1511 { 1512 1512 struct ieee80211_assoc_request_frame *a; 1513 1513 ··· 1597 1597 } 1598 1598 1599 1599 1600 - short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, 1600 + static short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, 1601 1601 u32 *time_l) 1602 1602 { 1603 1603 int timeout = 0; ··· 1651 1651 1652 1652 } 1653 1653 1654 - inline void ieee80211_sta_ps(struct ieee80211_device *ieee) 1654 + static inline void ieee80211_sta_ps(struct ieee80211_device *ieee) 1655 1655 { 1656 1656 1657 1657 u32 th,tl; ··· 2017 2017 } 2018 2018 2019 2019 /* called with ieee->lock acquired */ 2020 - void ieee80211_resume_tx(struct ieee80211_device *ieee) 2020 + static void ieee80211_resume_tx(struct ieee80211_device *ieee) 2021 2021 { 2022 2022 int i; 2023 2023 for(i = ieee->tx_pending.frag; i < ieee->tx_pending.txb->nr_frags; i++) { ··· 2147 2147 netif_carrier_on(ieee->dev); 2148 2148 } 2149 2149 2150 - void ieee80211_start_monitor_mode(struct ieee80211_device *ieee) 2150 + static void ieee80211_start_monitor_mode(struct ieee80211_device *ieee) 2151 2151 { 2152 2152 if(ieee->raw_tx){ 2153 2153 ··· 2158 2158 } 2159 2159 } 2160 2160 2161 - void ieee80211_start_ibss_wq(struct work_struct *work) 2161 + static void ieee80211_start_ibss_wq(struct work_struct *work) 2162 2162 { 2163 2163 struct delayed_work *dwork = to_delayed_work(work); 2164 2164 struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq); ··· 2331 2331 ieee->state = IEEE80211_NOLINK; 2332 2332 2333 2333 } 2334 - void ieee80211_associate_retry_wq(struct work_struct *work) 2334 + static void ieee80211_associate_retry_wq(struct work_struct *work) 2335 2335 { 2336 2336 struct delayed_work *dwork = to_delayed_work(work); 2337 2337 struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq); ··· 2623 2623 } 2624 2624 2625 2625 2626 - void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee, char *wpa_ie, 2626 + static void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee, char *wpa_ie, 2627 2627 int wpa_ie_len) 2628 2628 { 2629 2629 /* make sure WPA is enabled */