staging: rtl8723au: Eliminate write-once variable xmit_priv->vcs_setting

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index 6c75794af82d82279bf0ff92882d4ce8d4163ee4..8994bd848af84a9348a0cf381b35deba0f33fada 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -1295,7 +1295,7 @@ void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len)
        uint protection;
        const u8 *p;
 
-       switch (pxmitpriv->vcs_setting) {
+       switch (pregistrypriv->vrtl_carrier_sense) {
        case DISABLE_VCS:
                pxmitpriv->vcs = NONE_VCS;
                break;

diff --git a/drivers/staging/rtl8723au/include/rtw_xmit.h b/drivers/staging/rtl8723au/include/rtw_xmit.h
index 134ad6e500257a6c8211f4a408b6fb4bc76ed09b..70cd4b69d8f827e956d628237f489700b36f8b99 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_xmit.h
+++ b/drivers/staging/rtl8723au/include/rtw_xmit.h
@@ -295,7 +295,6 @@ struct      xmit_priv {
 
        struct rtw_adapter      *adapter;
 
-       u8   vcs_setting;
        u8      vcs;
 
        u64     tx_bytes;

diff --git a/drivers/staging/rtl8723au/os_dep/os_intfs.c b/drivers/staging/rtl8723au/os_dep/os_intfs.c
index 19cb11bde2ce1e31b89b7d408ac7d39aa2b04f73..ddd0a9f1eefb87bae72f0119fe58ae00f7928c60 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723au/os_dep/os_intfs.c
@@ -387,7 +387,6 @@ static int rtw_init_default_value(struct rtw_adapter *padapter)
        int ret = _SUCCESS;
 
        /* xmit_priv */
-       pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense;
        pxmitpriv->vcs = pregistrypriv->vcs_type;
        /* pxmitpriv->rts_thresh = pregistrypriv->rts_thresh; */
        pxmitpriv->frag_len = pregistrypriv->frag_thresh;