diff options
| author | Paul Gortmaker | 2015-04-27 07:25:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-05-08 09:24:13 +0200 |
| commit | 04fbf979b39b2805cb0da8a373f7f6e6b0e05bd9 (patch) | |
| tree | eb7d8f2eaddf90cc3c8856cd2b2421dff77e9397 /drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | |
| parent | staging: vt6655: Checkpatch fix: lines longer than 80 columns (diff) | |
| download | kernel-qcow2-linux-04fbf979b39b2805cb0da8a373f7f6e6b0e05bd9.tar.gz kernel-qcow2-linux-04fbf979b39b2805cb0da8a373f7f6e6b0e05bd9.tar.xz kernel-qcow2-linux-04fbf979b39b2805cb0da8a373f7f6e6b0e05bd9.zip | |
rtl8188eu: don't duplicate ieee80211 constants for status/reason
These are all defined as a part of the standard and should not be
duplicated on a per-driver basis. Use the global ones and delete the
local ones.
Note that a couple of them had slight wording differences, things like
INVALID vs. NOT_VALID or similar, so they are aligned with the global
naming conventions here, as dictated by compile testing.
This isn't the totality of duplicated data removed, but it is a start.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/core/rtw_mlme_ext.c')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c index be9e34a0daef..2da2e97647d6 100644 --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c @@ -19,6 +19,8 @@ ******************************************************************************/ #define _RTW_MLME_EXT_C_ +#include <linux/ieee80211.h> + #include <osdep_service.h> #include <drv_types.h> #include <wifi.h> @@ -1048,10 +1050,10 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher; if (!pstat->wpa2_group_cipher) - status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID; + status = WLAN_STATUS_INVALID_GROUP_CIPHER; if (!pstat->wpa2_pairwise_cipher) - status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID; + status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER; } else { status = WLAN_STATUS_INVALID_IE; } @@ -1069,10 +1071,10 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher; if (!pstat->wpa_group_cipher) - status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID; + status = WLAN_STATUS_INVALID_GROUP_CIPHER; if (!pstat->wpa_pairwise_cipher) - status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID; + status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER; } else { status = WLAN_STATUS_INVALID_IE; } |