Merge "qcacld-3.0: Fix CLANG warning for driver_type" into wlan-cld3.driver.lnx.2.0-dev

This commit is contained in:
CNSS_WLAN Service 2017-07-12 13:16:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit e17ccef45b
2 changed files with 5 additions and 14 deletions

View file

@ -36,11 +36,13 @@
*
* @DRIVER_TYPE_PRODUCTION: Driver used in the production
* @DRIVER_TYPE_MFG: Driver used in the Factory
* @DRIVER_TYPE_INVALID: Invalid and unrecognized type
*
*/
enum driver_type {
DRIVER_TYPE_PRODUCTION = 0,
DRIVER_TYPE_MFG = 1,
DRIVER_TYPE_INVALID = 0x7FFFFFFF
};
/**

View file

@ -40,6 +40,7 @@
#include "cfg_api.h"
#include "qdf_status.h"
#include "cds_sched.h"
#include "cds_config.h"
#include "sir_mac_prot_def.h"
#include "wma_types.h"
#include <linux/workqueue.h>
@ -520,18 +521,6 @@ typedef void (*txFailIndCallback)(uint8_t *peer_mac, uint8_t seqNo);
typedef void (*tp_wma_packetdump_cb)(qdf_nbuf_t netbuf,
uint8_t status, uint8_t vdev_id, uint8_t type);
/**
* enum t_wma_drv_type - wma driver type
* @WMA_DRIVER_TYPE_PRODUCTION: production driver type
* @WMA_DRIVER_TYPE_MFG: manufacture driver type
* @WMA_DRIVER_TYPE_INVALID: invalid driver type
*/
typedef enum {
WMA_DRIVER_TYPE_PRODUCTION = 0,
WMA_DRIVER_TYPE_MFG = 1,
WMA_DRIVER_TYPE_INVALID = 0x7FFFFFFF
} t_wma_drv_type;
#ifdef FEATURE_WLAN_TDLS
/**
* enum t_wma_tdls_mode - TDLS mode
@ -1364,7 +1353,7 @@ typedef struct {
qdf_event_t recovery_event;
uint16_t max_station;
uint16_t max_bssid;
t_wma_drv_type driver_type;
enum driver_type driver_type;
uint8_t myaddr[IEEE80211_ADDR_LEN];
uint8_t hwaddr[IEEE80211_ADDR_LEN];
wmi_abi_version target_abi_vers;
@ -1571,7 +1560,7 @@ struct wma_target_cap {
typedef struct {
void *pConfigBuffer;
uint16_t usConfigBufferLen;
t_wma_drv_type driver_type;
enum driver_type driver_type;
void *pUserData;
void *pIndUserData;
} t_wma_start_req;