staging: rtl8723au: Use ieee80211.h defines for IV/ICV len values

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_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index b78e453b7a0f8d0b802f168f45b1791626899cde..b0f218b4ca2fe6ea5870a41a9efa3901e5907018 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -3085,7 +3085,7 @@ static void issue_auth(struct rtw_adapter *padapter, struct sta_info *psta,
                                                     (unsigned char *)&val32,
                                                     &pattrib->pktlen);
 
-                       pattrib->iv_len = 4;
+                       pattrib->iv_len = IEEE80211_WEP_IV_LEN;
                }
 
                pframe = rtw_set_fixed_ie23a(pframe, _AUTH_ALGM_NUM_,
@@ -3121,7 +3121,7 @@ static void issue_auth(struct rtw_adapter *padapter, struct sta_info *psta,
 
                        pattrib->encrypt = WLAN_CIPHER_SUITE_WEP40;
 
-                       pattrib->icv_len = 4;
+                       pattrib->icv_len = IEEE80211_WEP_ICV_LEN;
 
                        pattrib->pktlen += pattrib->icv_len;
                }

diff --git a/drivers/staging/rtl8723au/core/rtw_recv.c b/drivers/staging/rtl8723au/core/rtw_recv.c
index 3275287ca25a9be7af2edfe0d771809d94e79fb8..24fa28848769bafd6b2cc94d52101d2ea54dfec4 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_recv.c
+++ b/drivers/staging/rtl8723au/core/rtw_recv.c
@@ -1410,16 +1410,16 @@ static int validate_recv_data_frame(struct rtw_adapter *adapter,
                {
                case WLAN_CIPHER_SUITE_WEP40:
                case WLAN_CIPHER_SUITE_WEP104:
-                       pattrib->iv_len = 4;
-                       pattrib->icv_len = 4;
+                       pattrib->iv_len = IEEE80211_WEP_IV_LEN;
+                       pattrib->icv_len = IEEE80211_WEP_ICV_LEN;
                        break;
                case WLAN_CIPHER_SUITE_TKIP:
-                       pattrib->iv_len = 8;
-                       pattrib->icv_len = 4;
+                       pattrib->iv_len = IEEE80211_TKIP_IV_LEN;
+                       pattrib->icv_len = IEEE80211_TKIP_ICV_LEN;
                        break;
                case WLAN_CIPHER_SUITE_CCMP:
-                       pattrib->iv_len = 8;
-                       pattrib->icv_len = 8;
+                       pattrib->iv_len = IEEE80211_CCMP_HDR_LEN;
+                       pattrib->icv_len = IEEE80211_CCMP_MIC_LEN;
                        break;
                default:
                        pattrib->iv_len = 0;

diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index 3869386f441a078402888ba3eae288c5d2e7333a..0c66d35416658aaba8e63ed9066cf10b581491fb 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -597,13 +597,13 @@ static int update_attrib(struct rtw_adapter *padapter,
        switch (pattrib->encrypt) {
        case WLAN_CIPHER_SUITE_WEP40:
        case WLAN_CIPHER_SUITE_WEP104:
-               pattrib->iv_len = 4;
-               pattrib->icv_len = 4;
+               pattrib->iv_len = IEEE80211_WEP_IV_LEN;
+               pattrib->icv_len = IEEE80211_WEP_ICV_LEN;
                break;
 
        case WLAN_CIPHER_SUITE_TKIP:
-               pattrib->iv_len = 8;
-               pattrib->icv_len = 4;
+               pattrib->iv_len = IEEE80211_TKIP_IV_LEN;
+               pattrib->icv_len = IEEE80211_TKIP_ICV_LEN;
 
                if (!padapter->securitypriv.busetkipkey) {
                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
@@ -619,8 +619,8 @@ static int update_attrib(struct rtw_adapter *padapter,
                RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
                         ("pattrib->encrypt =%d (WLAN_CIPHER_SUITE_CCMP)\n",
                          pattrib->encrypt));
-               pattrib->iv_len = 8;
-               pattrib->icv_len = 8;
+               pattrib->iv_len = IEEE80211_CCMP_HDR_LEN;
+               pattrib->icv_len = IEEE80211_CCMP_MIC_LEN;
                break;
 
        default: