Commit 96b74847 authored by Alwin Beukers's avatar Alwin Beukers Committed by Greg Kroah-Hartman

staging: brcm80211: decreased indentation level of brcms_c_wme_setparams function

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dd5be5ea
...@@ -4199,26 +4199,23 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci, ...@@ -4199,26 +4199,23 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
return; return;
} }
do { memset((char *)&acp_shm, 0, sizeof(struct shm_acparams));
memset((char *)&acp_shm, 0, sizeof(struct shm_acparams)); /* fill in shm ac params struct */
/* fill in shm ac params struct */ acp_shm.txop = params->txop;
acp_shm.txop = params->txop; /* convert from units of 32us to us for ucode */
/* convert from units of 32us to us for ucode */ wlc->edcf_txop[aci & 0x3] = acp_shm.txop =
wlc->edcf_txop[aci & 0x3] = acp_shm.txop = EDCF_TXOP2USEC(acp_shm.txop);
EDCF_TXOP2USEC(acp_shm.txop); acp_shm.aifs = (params->aifs & EDCF_AIFSN_MASK);
acp_shm.aifs = (params->aifs & EDCF_AIFSN_MASK);
if (aci == AC_VI && acp_shm.txop == 0
if (aci == AC_VI && acp_shm.txop == 0 && acp_shm.aifs < EDCF_AIFSN_MAX)
&& acp_shm.aifs < EDCF_AIFSN_MAX) acp_shm.aifs++;
acp_shm.aifs++;
if (acp_shm.aifs < EDCF_AIFSN_MIN
if (acp_shm.aifs < EDCF_AIFSN_MIN || acp_shm.aifs > EDCF_AIFSN_MAX) {
|| acp_shm.aifs > EDCF_AIFSN_MAX) { wiphy_err(wlc->wiphy, "wl%d: edcf_setparams: bad "
wiphy_err(wlc->wiphy, "wl%d: edcf_setparams: bad " "aifs %d\n", wlc->pub->unit, acp_shm.aifs);
"aifs %d\n", wlc->pub->unit, acp_shm.aifs); } else {
continue;
}
acp_shm.cwmin = params->cw_min; acp_shm.cwmin = params->cw_min;
acp_shm.cwmax = params->cw_max; acp_shm.cwmax = params->cw_max;
acp_shm.cwcur = acp_shm.cwmin; acp_shm.cwcur = acp_shm.cwmin;
...@@ -4239,8 +4236,7 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci, ...@@ -4239,8 +4236,7 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
M_EDCF_QINFO + M_EDCF_QINFO +
wme_ac2fifo[aci] * M_EDCF_QLEN + i, wme_ac2fifo[aci] * M_EDCF_QLEN + i,
*shm_entry++); *shm_entry++);
}
} while (0);
if (suspend) if (suspend)
brcms_c_suspend_mac_and_wait(wlc); brcms_c_suspend_mac_and_wait(wlc);
......
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