samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Replace wlan_phy_ch_width with phy_ch_width

Browse Source 
Delete enum wlan_phy_ch_width. Move phy_ch_width definition
from reg_services_public_struct.h to wlan_cmn.h.

Change-Id: I9f2b3ade1b023b9728274ce4edd3b90f562ae02e
CRs-Fixed: 2318356
This commit is contained in:
bings
2018-09-21 10:48:26 +08:00
committed by nshrivas
parent de9bd0182e
commit 747b176c98
3 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
umac/cmn_services/inc/wlan_cmn.h
View File

@@ -371,27 +371,27 @@ enum wlan_phymode {
#define WLAN_PHYMODE_MAX (WLAN_PHYMODE_11AXA_HE80_80 + 1)
/**
* enum wlan_phy_ch_width - channel width
* @WLAN_CH_WIDTH_20MHZ: 20 mhz width
* @WLAN_CH_WIDTH_40MHZ: 40 mhz width
* @WLAN_CH_WIDTH_80MHZ: 80 mhz width
* @WLAN_CH_WIDTH_160MHZ: 160 mhz width
* @WLAN_CH_WIDTH_80P80HZ: 80+80 mhz width
* @WLAN_CH_WIDTH_5MHZ: 5 mhz width
* @WLAN_CH_WIDTH_10MHZ: 10 mhz width
* @WLAN_CH_WIDTH_INVALID: invalid width
* @WLAN_CH_WIDTH_MAX: max possible width
* enum phy_ch_width - channel width
* @CH_WIDTH_20MHZ: 20 mhz width
* @CH_WIDTH_40MHZ: 40 mhz width
* @CH_WIDTH_80MHZ: 80 mhz width
* @CH_WIDTH_160MHZ: 160 mhz width
* @CH_WIDTH_80P80HZ: 80+80 mhz width
* @CH_WIDTH_5MHZ: 5 mhz width
* @CH_WIDTH_10MHZ: 10 mhz width
* @CH_WIDTH_INVALID: invalid width
* @CH_WIDTH_MAX: max possible width
*/
enum wlan_phy_ch_width {
WLAN_CH_WIDTH_20MHZ = 0,
WLAN_CH_WIDTH_40MHZ,
WLAN_CH_WIDTH_80MHZ,
WLAN_CH_WIDTH_160MHZ,
WLAN_CH_WIDTH_80P80MHZ,
WLAN_CH_WIDTH_5MHZ,
WLAN_CH_WIDTH_10MHZ,
WLAN_CH_WIDTH_INVALID,
WLAN_CH_WIDTH_MAX
enum phy_ch_width {
CH_WIDTH_20MHZ = 0,
CH_WIDTH_40MHZ,
CH_WIDTH_80MHZ,
CH_WIDTH_160MHZ,
CH_WIDTH_80P80MHZ,
CH_WIDTH_5MHZ,
CH_WIDTH_10MHZ,
CH_WIDTH_INVALID,
CH_WIDTH_MAX
};
/**

2
umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
View File

@@ -257,7 +257,7 @@ struct wlan_channel {
int8_t ch_maxpower;
uint8_t ch_freq_seg1;
uint8_t ch_freq_seg2;
enum wlan_phy_ch_width ch_width;
enum phy_ch_width ch_width;
enum wlan_phymode ch_phymode;
};

26
umac/regulatory/dispatcher/inc/reg_services_public_struct.h
View File

@@ -25,6 +25,7 @@
#define __REG_SERVICES_PUBLIC_STRUCT_H_
#include "../../core/src/reg_db.h"
#include "wlan_cmn.h"
#define REG_SBS_SEPARATION_THRESHOLD 100
#define REG_MAX_CHANNELS_PER_OPERATING_CLASS 25
@@ -509,31 +510,6 @@ typedef enum {
REGDOMAIN_COUNT
} v_REGDOMAIN_t;
/**
* enum phy_ch_width - channel width
* @CH_WIDTH_20MHZ: 20 mhz width
* @CH_WIDTH_40MHZ: 40 mhz width
* @CH_WIDTH_80MHZ: 80 mhz width
* @CH_WIDTH_160MHZ: 160 mhz width
* @CH_WIDTH_80P80HZ: 80+80 mhz width
* @CH_WIDTH_5MHZ: 5 mhz width
* @CH_WIDTH_10MHZ: 10 mhz width
* @CH_WIDTH_INVALID: invalid width
* @CH_WIDTH_MAX: max possible width
*/
enum phy_ch_width {
CH_WIDTH_20MHZ = 0,
CH_WIDTH_40MHZ,
CH_WIDTH_80MHZ,
CH_WIDTH_160MHZ,
CH_WIDTH_80P80MHZ,
CH_WIDTH_5MHZ,
CH_WIDTH_10MHZ,
CH_WIDTH_INVALID,
CH_WIDTH_MAX
};
/**
* struct ch_params
* @ch_width: channel width