diff options
| author |   Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-04-09 23:20:24 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-14 08:29:01 -0700 |
| commit | 04c3842773aff89c3c0bce54d982c07513b4a24d (patch) | |
| tree | 8b5dc868e43168836bee7993590de173f5e78884 | |
| parent | staging: rtl8723au: Eliminate HW_VAR_BEACON_INTERVAL (diff) | |
staging: rtl8723au: Eliminate HW_VAR_SLOT_TIME
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_wlan_util.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/hal_intf.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c index 8f1bd0708a13..183b2665abdd 100644 --- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c @@ -1600,7 +1600,7 @@ void update_capinfo23a(struct rtw_adapter *Adapter, u16 updateCap) pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME; } } - rtw_hal_set_hwreg23a(Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime); + rtl8723a_set_slot_time(Adapter, pmlmeinfo->slotTime); } void update_wireless_mode23a(struct rtw_adapter *padapter) diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c index 8931626a6946..9c5d8310376d 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c @@ -3143,10 +3143,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val) rtl8723a_set_bcn_func(padapter, *val); break; - case HW_VAR_SLOT_TIME: - rtl8723a_set_slot_time(padapter, *val); - break; - case HW_VAR_RESP_SIFS: rtl8723a_set_resp_sifs(padapter, val[0], val[1], val[2], val[3]); diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h index 395660193c81..edf54b77172d 100644 --- a/drivers/staging/rtl8723au/include/hal_intf.h +++ b/drivers/staging/rtl8723au/include/hal_intf.h @@ -39,7 +39,6 @@ enum HW_VARIABLES { HW_VAR_INIT_RTS_RATE, HW_VAR_TXPAUSE, HW_VAR_BCN_FUNC, - HW_VAR_SLOT_TIME, HW_VAR_RESP_SIFS, HW_VAR_ACK_PREAMBLE, HW_VAR_SEC_CFG, |