Commit acd442db authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

rtl8192e: delete local copy of iee80211 reason codes. 



This driver has a copy of the standard reason codes from the file
<linux/ieee80211.h> but with slightly different name fields.

Delete the local copy and remap the only two use cases onto the names
used by the global implementation with the same values.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09e0b2ff

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/uaccess.h>

#include <linux/pci.h>

#include <linux/vmalloc.h>

#include <linux/ieee80211.h>

#include "rtl_core.h"

#include "r8192E_phy.h"

#include "r8192E_phyreg.h"
@@ -391,7 +392,7 @@ bool MgntActSet_RF_State(struct net_device *dev, 
				else

					priv->blinked_ingpio = false;

				rtllib_MgntDisconnect(priv->rtllib,

						      disas_lv_ss);

						      WLAN_REASON_DISASSOC_STA_HAS_LEFT);

			}

		}

		if ((ChangeSource == RF_CHANGE_BY_HW) && !priv->bHwRadioOff)

drivers/staging/rtl8192e/rtllib.h

+0 −39
Original line number Diff line number Diff line
@@ -261,45 +261,6 @@ struct sw_chnl_cmd { 
#define	MGN_MCS14_SG		0x9e

#define	MGN_MCS15_SG		0x9f





enum	_ReasonCode {

	unspec_reason	= 0x1,

	auth_not_valid	= 0x2,

	deauth_lv_ss	= 0x3,

	inactivity		= 0x4,

	ap_overload	= 0x5,

	class2_err		= 0x6,

	class3_err		= 0x7,

	disas_lv_ss	= 0x8,

	asoc_not_auth	= 0x9,



	mic_failure	= 0xe,



	invalid_IE		= 0x0d,

	four_way_tmout	= 0x0f,

	two_way_tmout	= 0x10,

	IE_dismatch	= 0x11,

	invalid_Gcipher = 0x12,

	invalid_Pcipher = 0x13,

	invalid_AKMP	= 0x14,

	unsup_RSNIEver = 0x15,

	invalid_RSNIE	= 0x16,

	auth_802_1x_fail = 0x17,

	ciper_reject		= 0x18,



	QoS_unspec		= 0x20,

	QAP_bandwidth	= 0x21,

	poor_condition	= 0x22,

	no_facility	= 0x23,

	req_declined	= 0x25,

	invalid_param	= 0x26,

	req_not_honored = 0x27,

	TS_not_created	= 0x2F,

	DL_not_allowed	= 0x30,

	dest_not_exist	= 0x31,

	dest_not_QSTA	= 0x32,

};



enum hal_def_variable {

	HAL_DEF_TPC_ENABLE,

	HAL_DEF_INIT_GAIN,

drivers/staging/rtl8192e/rtllib_softmac.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/delay.h>

#include <linux/uaccess.h>

#include <linux/etherdevice.h>

#include <linux/ieee80211.h>

#include "dot11d.h"



short rtllib_is_54g(struct rtllib_network *net)
@@ -2983,7 +2984,7 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) 


	if (ieee->state == RTLLIB_LINKED) {

		if (ieee->iw_mode == IW_MODE_INFRA)

			SendDisassociation(ieee, 1, deauth_lv_ss);

			SendDisassociation(ieee, 1, WLAN_REASON_DEAUTH_LEAVING);

		rtllib_disassociate(ieee);

	}