aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c')
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
index 7888cfe383f..92cd71c3217 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
@@ -601,7 +601,7 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee)
601 if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) 601 if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
602 ieee80211_softmac_stop_scan(ieee); 602 ieee80211_softmac_stop_scan(ieee);
603 else 603 else
604 ieee->stop_scan(ieee->dev); 604 ieee->stop_scan(ieee);
605} 605}
606 606
607/* called with ieee->lock held */ 607/* called with ieee->lock held */
@@ -627,7 +627,7 @@ void ieee80211_rtl_start_scan(struct ieee80211_device *ieee)
627 queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, 0); 627 queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, 0);
628 } 628 }
629 }else 629 }else
630 ieee->start_scan(ieee->dev); 630 ieee->start_scan(ieee);
631 631
632} 632}
633 633
@@ -647,7 +647,7 @@ void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
647 if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) 647 if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
648 ieee80211_softmac_scan_syncro(ieee); 648 ieee80211_softmac_scan_syncro(ieee);
649 else 649 else
650 ieee->scan_syncro(ieee->dev); 650 ieee->scan_syncro(ieee);
651 651
652} 652}
653 653
@@ -1378,7 +1378,7 @@ void ieee80211_associate_complete_wq(struct work_struct *work)
1378 ieee->LinkDetectInfo.NumRecvBcnInPeriod = 1; 1378 ieee->LinkDetectInfo.NumRecvBcnInPeriod = 1;
1379 ieee->LinkDetectInfo.NumRecvDataInPeriod= 1; 1379 ieee->LinkDetectInfo.NumRecvDataInPeriod= 1;
1380 } 1380 }
1381 ieee->link_change(ieee->dev); 1381 ieee->link_change(ieee);
1382 if(ieee->is_silent_reset == 0){ 1382 if(ieee->is_silent_reset == 0){
1383 printk("============>normal associate\n"); 1383 printk("============>normal associate\n");
1384 notify_wx_assoc_event(ieee); 1384 notify_wx_assoc_event(ieee);
@@ -2350,7 +2350,7 @@ void ieee80211_start_master_bss(struct ieee80211_device *ieee)
2350 2350
2351 ieee->set_chan(ieee, ieee->current_network.channel); 2351 ieee->set_chan(ieee, ieee->current_network.channel);
2352 ieee->state = IEEE80211_LINKED; 2352 ieee->state = IEEE80211_LINKED;
2353 ieee->link_change(ieee->dev); 2353 ieee->link_change(ieee);
2354 notify_wx_assoc_event(ieee); 2354 notify_wx_assoc_event(ieee);
2355 2355
2356 if (ieee->data_hard_resume) 2356 if (ieee->data_hard_resume)
@@ -2468,7 +2468,7 @@ void ieee80211_start_ibss_wq(struct work_struct *work)
2468 ieee->state = IEEE80211_LINKED; 2468 ieee->state = IEEE80211_LINKED;
2469 2469
2470 ieee->set_chan(ieee, ieee->current_network.channel); 2470 ieee->set_chan(ieee, ieee->current_network.channel);
2471 ieee->link_change(ieee->dev); 2471 ieee->link_change(ieee);
2472 2472
2473 notify_wx_assoc_event(ieee); 2473 notify_wx_assoc_event(ieee);
2474 2474
@@ -2546,7 +2546,7 @@ void ieee80211_disassociate(struct ieee80211_device *ieee)
2546 Dot11d_Reset(ieee); 2546 Dot11d_Reset(ieee);
2547#endif 2547#endif
2548 ieee->is_set_key = false; 2548 ieee->is_set_key = false;
2549 ieee->link_change(ieee->dev); 2549 ieee->link_change(ieee);
2550 if (ieee->state == IEEE80211_LINKED || 2550 if (ieee->state == IEEE80211_LINKED ||
2551 ieee->state == IEEE80211_ASSOCIATING) { 2551 ieee->state == IEEE80211_ASSOCIATING) {
2552 ieee->state = IEEE80211_NOLINK; 2552 ieee->state = IEEE80211_NOLINK;