Commit 03ea25f0 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman

staging: rtl8188eu: core: Remove wrapper function

Remove wrapper function issue_probereq() that can be replaced by a
single line of code and rename _issue_probereq() to issue_probereq().

This patch also fixes line over 80 characters checkpatch.pl warning.
Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce3b84ab
...@@ -609,7 +609,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da) ...@@ -609,7 +609,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da)
return; return;
} }
static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack) static int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack)
{ {
int ret = _FAIL; int ret = _FAIL;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
...@@ -702,12 +702,6 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps ...@@ -702,12 +702,6 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
return ret; return ret;
} }
static inline void issue_probereq(struct adapter *padapter,
struct ndis_802_11_ssid *pssid, u8 *da)
{
_issue_probereq(padapter, pssid, da, false);
}
static int issue_probereq_ex(struct adapter *padapter, static int issue_probereq_ex(struct adapter *padapter,
struct ndis_802_11_ssid *pssid, u8 *da, struct ndis_802_11_ssid *pssid, u8 *da,
int try_cnt, int wait_ms) int try_cnt, int wait_ms)
...@@ -717,7 +711,7 @@ static int issue_probereq_ex(struct adapter *padapter, ...@@ -717,7 +711,7 @@ static int issue_probereq_ex(struct adapter *padapter,
u32 start = jiffies; u32 start = jiffies;
do { do {
ret = _issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false); ret = issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false);
i++; i++;
...@@ -2029,24 +2023,28 @@ static void site_survey(struct adapter *padapter) ...@@ -2029,24 +2023,28 @@ static void site_survey(struct adapter *padapter)
for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) { for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) {
if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) { if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) {
/* todo: to issue two probe req??? */ /* todo: to issue two probe req??? */
issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); issue_probereq(padapter,
&(pmlmeext->sitesurvey_res.ssid[i]),
NULL, false);
/* msleep(SURVEY_TO>>1); */ /* msleep(SURVEY_TO>>1); */
issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); issue_probereq(padapter,
&(pmlmeext->sitesurvey_res.ssid[i]),
NULL, false);
} }
} }
if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) { if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {
/* todo: to issue two probe req??? */ /* todo: to issue two probe req??? */
issue_probereq(padapter, NULL, NULL); issue_probereq(padapter, NULL, NULL, false);
/* msleep(SURVEY_TO>>1); */ /* msleep(SURVEY_TO>>1); */
issue_probereq(padapter, NULL, NULL); issue_probereq(padapter, NULL, NULL, false);
} }
if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) { if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {
/* todo: to issue two probe req??? */ /* todo: to issue two probe req??? */
issue_probereq(padapter, NULL, NULL); issue_probereq(padapter, NULL, NULL, false);
/* msleep(SURVEY_TO>>1); */ /* msleep(SURVEY_TO>>1); */
issue_probereq(padapter, NULL, NULL); issue_probereq(padapter, NULL, NULL, false);
} }
} }
...@@ -4820,9 +4818,18 @@ void linked_status_chk(struct adapter *padapter) ...@@ -4820,9 +4818,18 @@ void linked_status_chk(struct adapter *padapter)
} else { } else {
if (rx_chk != _SUCCESS) { if (rx_chk != _SUCCESS) {
if (pmlmeext->retry == 0) { if (pmlmeext->retry == 0) {
issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress); issue_probereq(padapter,
issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress); &pmlmeinfo->network.Ssid,
issue_probereq(padapter, &pmlmeinfo->network.Ssid, pmlmeinfo->network.MacAddress); pmlmeinfo->network.MacAddress,
false);
issue_probereq(padapter,
&pmlmeinfo->network.Ssid,
pmlmeinfo->network.MacAddress,
false);
issue_probereq(padapter,
&pmlmeinfo->network.Ssid,
pmlmeinfo->network.MacAddress,
false);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment