staging: rtl8712: fix stack dump
del_timer_sync() is not to be called in the interrupt context unless the timer is irqsafe. but most of the functions where commits6501c8e7d8
and382d020f44
touched were called in interrupt context. And as a result the WARN_ON was getting triggered. Changed to del_timer() in places which were called from interrupt. Fixes:382d020f44
("Staging: rtl8712: Eliminate use of _cancel_timer" Fixes:6501c8e7d8
("Staging: rtl8712: Eliminate use of _cancel_timer_ex") Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=97711 Reported-by: Arek Rusniak <arek.rusi@gmail.com> Tested-by: Arek Rusniak <arek.rusi@gmail.com> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9a59029bc2
commit
39a6e7376a
|
@ -898,11 +898,11 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
IS_LED_WPS_BLINKING(pLed))
|
IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedLinkBlinkInProgress == true) {
|
if (pLed->bLedLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedNoLinkBlinkInProgress = true;
|
pLed->bLedNoLinkBlinkInProgress = true;
|
||||||
|
@ -921,11 +921,11 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
IS_LED_WPS_BLINKING(pLed))
|
IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedLinkBlinkInProgress = true;
|
pLed->bLedLinkBlinkInProgress = true;
|
||||||
|
@ -946,15 +946,15 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
if (IS_LED_WPS_BLINKING(pLed))
|
if (IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedLinkBlinkInProgress == true) {
|
if (pLed->bLedLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedScanBlinkInProgress = true;
|
pLed->bLedScanBlinkInProgress = true;
|
||||||
|
@ -975,11 +975,11 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
IS_LED_WPS_BLINKING(pLed))
|
IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedLinkBlinkInProgress == true) {
|
if (pLed->bLedLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedBlinkInProgress = true;
|
pLed->bLedBlinkInProgress = true;
|
||||||
|
@ -998,19 +998,19 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
case LED_CTL_START_WPS_BOTTON:
|
case LED_CTL_START_WPS_BOTTON:
|
||||||
if (pLed->bLedWPSBlinkInProgress == false) {
|
if (pLed->bLedWPSBlinkInProgress == false) {
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedLinkBlinkInProgress == true) {
|
if (pLed->bLedLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress == true) {
|
if (pLed->bLedScanBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
|
@ -1025,23 +1025,23 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS:
|
case LED_CTL_STOP_WPS:
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedLinkBlinkInProgress == true) {
|
if (pLed->bLedLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress == true) {
|
if (pLed->bLedScanBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress)
|
if (pLed->bLedWPSBlinkInProgress)
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
else
|
else
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
pLed->CurrLedState = LED_BLINK_WPS_STOP;
|
pLed->CurrLedState = LED_BLINK_WPS_STOP;
|
||||||
|
@ -1057,7 +1057,7 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS_FAIL:
|
case LED_CTL_STOP_WPS_FAIL:
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedNoLinkBlinkInProgress = true;
|
pLed->bLedNoLinkBlinkInProgress = true;
|
||||||
|
@ -1073,23 +1073,23 @@ static void SwLedControlMode1(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
pLed->BlinkingLedState = LED_OFF;
|
pLed->BlinkingLedState = LED_OFF;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress) {
|
if (pLed->bLedNoLinkBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedLinkBlinkInProgress) {
|
if (pLed->bLedLinkBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress) {
|
if (pLed->bLedScanBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
mod_timer(&pLed->BlinkTimer,
|
mod_timer(&pLed->BlinkTimer,
|
||||||
|
@ -1116,7 +1116,7 @@ static void SwLedControlMode2(struct _adapter *padapter,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedScanBlinkInProgress = true;
|
pLed->bLedScanBlinkInProgress = true;
|
||||||
|
@ -1154,11 +1154,11 @@ static void SwLedControlMode2(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_ON;
|
pLed->CurrLedState = LED_ON;
|
||||||
pLed->BlinkingLedState = LED_ON;
|
pLed->BlinkingLedState = LED_ON;
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress) {
|
if (pLed->bLedScanBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1170,11 +1170,11 @@ static void SwLedControlMode2(struct _adapter *padapter,
|
||||||
case LED_CTL_START_WPS_BOTTON:
|
case LED_CTL_START_WPS_BOTTON:
|
||||||
if (pLed->bLedWPSBlinkInProgress == false) {
|
if (pLed->bLedWPSBlinkInProgress == false) {
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress == true) {
|
if (pLed->bLedScanBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
|
@ -1214,15 +1214,15 @@ static void SwLedControlMode2(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
pLed->BlinkingLedState = LED_OFF;
|
pLed->BlinkingLedState = LED_OFF;
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress) {
|
if (pLed->bLedScanBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
mod_timer(&pLed->BlinkTimer,
|
mod_timer(&pLed->BlinkTimer,
|
||||||
|
@ -1248,7 +1248,7 @@ static void SwLedControlMode3(struct _adapter *padapter,
|
||||||
if (IS_LED_WPS_BLINKING(pLed))
|
if (IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedScanBlinkInProgress = true;
|
pLed->bLedScanBlinkInProgress = true;
|
||||||
|
@ -1286,11 +1286,11 @@ static void SwLedControlMode3(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_ON;
|
pLed->CurrLedState = LED_ON;
|
||||||
pLed->BlinkingLedState = LED_ON;
|
pLed->BlinkingLedState = LED_ON;
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress) {
|
if (pLed->bLedScanBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
mod_timer(&pLed->BlinkTimer,
|
mod_timer(&pLed->BlinkTimer,
|
||||||
|
@ -1300,11 +1300,11 @@ static void SwLedControlMode3(struct _adapter *padapter,
|
||||||
case LED_CTL_START_WPS_BOTTON:
|
case LED_CTL_START_WPS_BOTTON:
|
||||||
if (pLed->bLedWPSBlinkInProgress == false) {
|
if (pLed->bLedWPSBlinkInProgress == false) {
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress == true) {
|
if (pLed->bLedScanBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
|
@ -1319,7 +1319,7 @@ static void SwLedControlMode3(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS:
|
case LED_CTL_STOP_WPS:
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&(pLed->BlinkTimer));
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
} else
|
} else
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
|
@ -1336,7 +1336,7 @@ static void SwLedControlMode3(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS_FAIL:
|
case LED_CTL_STOP_WPS_FAIL:
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
|
@ -1357,15 +1357,15 @@ static void SwLedControlMode3(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
pLed->BlinkingLedState = LED_OFF;
|
pLed->BlinkingLedState = LED_OFF;
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress) {
|
if (pLed->bLedScanBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
mod_timer(&pLed->BlinkTimer,
|
mod_timer(&pLed->BlinkTimer,
|
||||||
|
@ -1388,7 +1388,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
case LED_CTL_START_TO_LINK:
|
case LED_CTL_START_TO_LINK:
|
||||||
if (pLed1->bLedWPSBlinkInProgress) {
|
if (pLed1->bLedWPSBlinkInProgress) {
|
||||||
pLed1->bLedWPSBlinkInProgress = false;
|
pLed1->bLedWPSBlinkInProgress = false;
|
||||||
del_timer_sync(&pLed1->BlinkTimer);
|
del_timer(&pLed1->BlinkTimer);
|
||||||
pLed1->BlinkingLedState = LED_OFF;
|
pLed1->BlinkingLedState = LED_OFF;
|
||||||
pLed1->CurrLedState = LED_OFF;
|
pLed1->CurrLedState = LED_OFF;
|
||||||
if (pLed1->bLedOn)
|
if (pLed1->bLedOn)
|
||||||
|
@ -1400,11 +1400,11 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
IS_LED_WPS_BLINKING(pLed))
|
IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedStartToLinkBlinkInProgress = true;
|
pLed->bLedStartToLinkBlinkInProgress = true;
|
||||||
|
@ -1426,7 +1426,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
if (LedAction == LED_CTL_LINK) {
|
if (LedAction == LED_CTL_LINK) {
|
||||||
if (pLed1->bLedWPSBlinkInProgress) {
|
if (pLed1->bLedWPSBlinkInProgress) {
|
||||||
pLed1->bLedWPSBlinkInProgress = false;
|
pLed1->bLedWPSBlinkInProgress = false;
|
||||||
del_timer_sync(&pLed1->BlinkTimer);
|
del_timer(&pLed1->BlinkTimer);
|
||||||
pLed1->BlinkingLedState = LED_OFF;
|
pLed1->BlinkingLedState = LED_OFF;
|
||||||
pLed1->CurrLedState = LED_OFF;
|
pLed1->CurrLedState = LED_OFF;
|
||||||
if (pLed1->bLedOn)
|
if (pLed1->bLedOn)
|
||||||
|
@ -1439,7 +1439,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
IS_LED_WPS_BLINKING(pLed))
|
IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedNoLinkBlinkInProgress = true;
|
pLed->bLedNoLinkBlinkInProgress = true;
|
||||||
|
@ -1460,11 +1460,11 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
if (IS_LED_WPS_BLINKING(pLed))
|
if (IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedScanBlinkInProgress = true;
|
pLed->bLedScanBlinkInProgress = true;
|
||||||
|
@ -1485,7 +1485,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
IS_LED_WPS_BLINKING(pLed))
|
IS_LED_WPS_BLINKING(pLed))
|
||||||
return;
|
return;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedBlinkInProgress = true;
|
pLed->bLedBlinkInProgress = true;
|
||||||
|
@ -1503,7 +1503,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
case LED_CTL_START_WPS_BOTTON:
|
case LED_CTL_START_WPS_BOTTON:
|
||||||
if (pLed1->bLedWPSBlinkInProgress) {
|
if (pLed1->bLedWPSBlinkInProgress) {
|
||||||
pLed1->bLedWPSBlinkInProgress = false;
|
pLed1->bLedWPSBlinkInProgress = false;
|
||||||
del_timer_sync(&(pLed1->BlinkTimer));
|
del_timer(&pLed1->BlinkTimer);
|
||||||
pLed1->BlinkingLedState = LED_OFF;
|
pLed1->BlinkingLedState = LED_OFF;
|
||||||
pLed1->CurrLedState = LED_OFF;
|
pLed1->CurrLedState = LED_OFF;
|
||||||
if (pLed1->bLedOn)
|
if (pLed1->bLedOn)
|
||||||
|
@ -1512,15 +1512,15 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress == false) {
|
if (pLed->bLedWPSBlinkInProgress == false) {
|
||||||
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
if (pLed->bLedNoLinkBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress == true) {
|
if (pLed->bLedScanBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
|
@ -1538,7 +1538,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS: /*WPS connect success*/
|
case LED_CTL_STOP_WPS: /*WPS connect success*/
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedNoLinkBlinkInProgress = true;
|
pLed->bLedNoLinkBlinkInProgress = true;
|
||||||
|
@ -1552,7 +1552,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS_FAIL: /*WPS authentication fail*/
|
case LED_CTL_STOP_WPS_FAIL: /*WPS authentication fail*/
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedNoLinkBlinkInProgress = true;
|
pLed->bLedNoLinkBlinkInProgress = true;
|
||||||
|
@ -1565,7 +1565,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
|
msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
|
||||||
/*LED1 settings*/
|
/*LED1 settings*/
|
||||||
if (pLed1->bLedWPSBlinkInProgress)
|
if (pLed1->bLedWPSBlinkInProgress)
|
||||||
del_timer_sync(&pLed1->BlinkTimer);
|
del_timer(&pLed1->BlinkTimer);
|
||||||
else
|
else
|
||||||
pLed1->bLedWPSBlinkInProgress = true;
|
pLed1->bLedWPSBlinkInProgress = true;
|
||||||
pLed1->CurrLedState = LED_BLINK_WPS_STOP;
|
pLed1->CurrLedState = LED_BLINK_WPS_STOP;
|
||||||
|
@ -1578,7 +1578,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
break;
|
break;
|
||||||
case LED_CTL_STOP_WPS_FAIL_OVERLAP: /*WPS session overlap*/
|
case LED_CTL_STOP_WPS_FAIL_OVERLAP: /*WPS session overlap*/
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedNoLinkBlinkInProgress = true;
|
pLed->bLedNoLinkBlinkInProgress = true;
|
||||||
|
@ -1591,7 +1591,7 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
|
msecs_to_jiffies(LED_BLINK_NO_LINK_INTERVAL_ALPHA));
|
||||||
/*LED1 settings*/
|
/*LED1 settings*/
|
||||||
if (pLed1->bLedWPSBlinkInProgress)
|
if (pLed1->bLedWPSBlinkInProgress)
|
||||||
del_timer_sync(&pLed1->BlinkTimer);
|
del_timer(&pLed1->BlinkTimer);
|
||||||
else
|
else
|
||||||
pLed1->bLedWPSBlinkInProgress = true;
|
pLed1->bLedWPSBlinkInProgress = true;
|
||||||
pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP;
|
pLed1->CurrLedState = LED_BLINK_WPS_STOP_OVERLAP;
|
||||||
|
@ -1607,31 +1607,31 @@ static void SwLedControlMode4(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
pLed->BlinkingLedState = LED_OFF;
|
pLed->BlinkingLedState = LED_OFF;
|
||||||
if (pLed->bLedNoLinkBlinkInProgress) {
|
if (pLed->bLedNoLinkBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedNoLinkBlinkInProgress = false;
|
pLed->bLedNoLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedLinkBlinkInProgress) {
|
if (pLed->bLedLinkBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedLinkBlinkInProgress = false;
|
pLed->bLedLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedScanBlinkInProgress) {
|
if (pLed->bLedScanBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedScanBlinkInProgress = false;
|
pLed->bLedScanBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedStartToLinkBlinkInProgress) {
|
if (pLed->bLedStartToLinkBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedStartToLinkBlinkInProgress = false;
|
pLed->bLedStartToLinkBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed1->bLedWPSBlinkInProgress) {
|
if (pLed1->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed1->BlinkTimer);
|
del_timer(&pLed1->BlinkTimer);
|
||||||
pLed1->bLedWPSBlinkInProgress = false;
|
pLed1->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed1->BlinkingLedState = LED_UNKNOWN;
|
pLed1->BlinkingLedState = LED_UNKNOWN;
|
||||||
|
@ -1671,7 +1671,7 @@ static void SwLedControlMode5(struct _adapter *padapter,
|
||||||
; /* dummy branch */
|
; /* dummy branch */
|
||||||
else if (pLed->bLedScanBlinkInProgress == false) {
|
else if (pLed->bLedScanBlinkInProgress == false) {
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedScanBlinkInProgress = true;
|
pLed->bLedScanBlinkInProgress = true;
|
||||||
|
@ -1705,7 +1705,7 @@ static void SwLedControlMode5(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
pLed->BlinkingLedState = LED_OFF;
|
pLed->BlinkingLedState = LED_OFF;
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
SwLedOff(padapter, pLed);
|
SwLedOff(padapter, pLed);
|
||||||
|
@ -1756,7 +1756,7 @@ static void SwLedControlMode6(struct _adapter *padapter,
|
||||||
case LED_CTL_START_WPS_BOTTON:
|
case LED_CTL_START_WPS_BOTTON:
|
||||||
if (pLed->bLedWPSBlinkInProgress == false) {
|
if (pLed->bLedWPSBlinkInProgress == false) {
|
||||||
if (pLed->bLedBlinkInProgress == true) {
|
if (pLed->bLedBlinkInProgress == true) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->bLedWPSBlinkInProgress = true;
|
pLed->bLedWPSBlinkInProgress = true;
|
||||||
|
@ -1772,7 +1772,7 @@ static void SwLedControlMode6(struct _adapter *padapter,
|
||||||
case LED_CTL_STOP_WPS_FAIL:
|
case LED_CTL_STOP_WPS_FAIL:
|
||||||
case LED_CTL_STOP_WPS:
|
case LED_CTL_STOP_WPS:
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
pLed->CurrLedState = LED_ON;
|
pLed->CurrLedState = LED_ON;
|
||||||
|
@ -1784,11 +1784,11 @@ static void SwLedControlMode6(struct _adapter *padapter,
|
||||||
pLed->CurrLedState = LED_OFF;
|
pLed->CurrLedState = LED_OFF;
|
||||||
pLed->BlinkingLedState = LED_OFF;
|
pLed->BlinkingLedState = LED_OFF;
|
||||||
if (pLed->bLedBlinkInProgress) {
|
if (pLed->bLedBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedBlinkInProgress = false;
|
pLed->bLedBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
if (pLed->bLedWPSBlinkInProgress) {
|
if (pLed->bLedWPSBlinkInProgress) {
|
||||||
del_timer_sync(&pLed->BlinkTimer);
|
del_timer(&pLed->BlinkTimer);
|
||||||
pLed->bLedWPSBlinkInProgress = false;
|
pLed->bLedWPSBlinkInProgress = false;
|
||||||
}
|
}
|
||||||
SwLedOff(padapter, pLed);
|
SwLedOff(padapter, pLed);
|
||||||
|
|
|
@ -910,7 +910,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
|
||||||
if (pcmd->res != H2C_SUCCESS)
|
if (pcmd->res != H2C_SUCCESS)
|
||||||
mod_timer(&pmlmepriv->assoc_timer,
|
mod_timer(&pmlmepriv->assoc_timer,
|
||||||
jiffies + msecs_to_jiffies(1));
|
jiffies + msecs_to_jiffies(1));
|
||||||
del_timer_sync(&pmlmepriv->assoc_timer);
|
del_timer(&pmlmepriv->assoc_timer);
|
||||||
#ifdef __BIG_ENDIAN
|
#ifdef __BIG_ENDIAN
|
||||||
/* endian_convert */
|
/* endian_convert */
|
||||||
pnetwork->Length = le32_to_cpu(pnetwork->Length);
|
pnetwork->Length = le32_to_cpu(pnetwork->Length);
|
||||||
|
|
|
@ -582,7 +582,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
|
||||||
spin_lock_irqsave(&pmlmepriv->lock, irqL);
|
spin_lock_irqsave(&pmlmepriv->lock, irqL);
|
||||||
|
|
||||||
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
|
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
|
||||||
del_timer_sync(&pmlmepriv->scan_to_timer);
|
del_timer(&pmlmepriv->scan_to_timer);
|
||||||
|
|
||||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
|
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
|
||||||
}
|
}
|
||||||
|
@ -696,7 +696,7 @@ void r8712_ind_disconnect(struct _adapter *padapter)
|
||||||
}
|
}
|
||||||
if (padapter->pwrctrlpriv.pwr_mode !=
|
if (padapter->pwrctrlpriv.pwr_mode !=
|
||||||
padapter->registrypriv.power_mgnt) {
|
padapter->registrypriv.power_mgnt) {
|
||||||
del_timer_sync(&pmlmepriv->dhcp_timer);
|
del_timer(&pmlmepriv->dhcp_timer);
|
||||||
r8712_set_ps_mode(padapter, padapter->registrypriv.power_mgnt,
|
r8712_set_ps_mode(padapter, padapter->registrypriv.power_mgnt,
|
||||||
padapter->registrypriv.smart_ps);
|
padapter->registrypriv.smart_ps);
|
||||||
}
|
}
|
||||||
|
@ -910,7 +910,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
|
||||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
|
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
|
||||||
== true)
|
== true)
|
||||||
r8712_indicate_connect(adapter);
|
r8712_indicate_connect(adapter);
|
||||||
del_timer_sync(&pmlmepriv->assoc_timer);
|
del_timer(&pmlmepriv->assoc_timer);
|
||||||
} else
|
} else
|
||||||
goto ignore_joinbss_callback;
|
goto ignore_joinbss_callback;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -103,7 +103,7 @@ void r8712_cpwm_int_hdl(struct _adapter *padapter,
|
||||||
|
|
||||||
if (pwrpriv->cpwm_tog == ((preportpwrstate->state) & 0x80))
|
if (pwrpriv->cpwm_tog == ((preportpwrstate->state) & 0x80))
|
||||||
return;
|
return;
|
||||||
del_timer_sync(&padapter->pwrctrlpriv.rpwm_check_timer);
|
del_timer(&padapter->pwrctrlpriv.rpwm_check_timer);
|
||||||
_enter_pwrlock(&pwrpriv->lock);
|
_enter_pwrlock(&pwrpriv->lock);
|
||||||
pwrpriv->cpwm = (preportpwrstate->state) & 0xf;
|
pwrpriv->cpwm = (preportpwrstate->state) & 0xf;
|
||||||
if (pwrpriv->cpwm >= PS_STATE_S2) {
|
if (pwrpriv->cpwm >= PS_STATE_S2) {
|
||||||
|
|
|
@ -198,7 +198,7 @@ void r8712_free_stainfo(struct _adapter *padapter, struct sta_info *psta)
|
||||||
* cancel reordering_ctrl_timer */
|
* cancel reordering_ctrl_timer */
|
||||||
for (i = 0; i < 16; i++) {
|
for (i = 0; i < 16; i++) {
|
||||||
preorder_ctrl = &psta->recvreorder_ctrl[i];
|
preorder_ctrl = &psta->recvreorder_ctrl[i];
|
||||||
del_timer_sync(&preorder_ctrl->reordering_ctrl_timer);
|
del_timer(&preorder_ctrl->reordering_ctrl_timer);
|
||||||
}
|
}
|
||||||
spin_lock(&(pfree_sta_queue->lock));
|
spin_lock(&(pfree_sta_queue->lock));
|
||||||
/* insert into free_sta_queue; 20061114 */
|
/* insert into free_sta_queue; 20061114 */
|
||||||
|
|
Loading…
Reference in New Issue