Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20b33b19 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: 80211mgr.h add ieee80211.h header and fix conflicts 



Fix conflict with WLAN_EID macros, by removing them.

This allows the adding other definitions from the ieee80211 header.

Eventually the 80211mgr.h header will be removed.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43e79c0f

drivers/staging/vt6655/80211mgr.h

+1 −8
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define __80211MGR_H__



#include <linux/types.h>

#include "linux/ieee80211.h"



#include "ttype.h"

#include "80211hdr.h"
@@ -39,17 +40,10 @@ 
#define WLAN_MIN_ARRAY          1



/* Information Element ID value */

#define WLAN_EID_SSID           0

#define WLAN_EID_SUPP_RATES     1

#define WLAN_EID_FH_PARMS       2

#define WLAN_EID_DS_PARMS       3

#define WLAN_EID_CF_PARMS       4

#define WLAN_EID_TIM            5

#define WLAN_EID_IBSS_PARMS     6

#define WLAN_EID_COUNTRY        7

#define WLAN_EID_CHALLENGE      16

#define WLAN_EID_PWR_CONSTRAINT 32

#define WLAN_EID_PWR_CAPABILITY 33

#define WLAN_EID_TPC_REQ        34

#define WLAN_EID_TPC_REP        35

#define WLAN_EID_SUPP_CH        36
@@ -60,7 +54,6 @@ 
#define WLAN_EID_IBSS_DFS       41

#define WLAN_EID_ERP            42

/* reference 802.11i 7.3.2 table 20 */

#define WLAN_EID_RSN            48

#define WLAN_EID_EXTSUPP_RATES  50

/* reference WiFi WPA spec. */

#define WLAN_EID_RSN_WPA        221