diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-07-03 10:31:51 -0700 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-07-03 14:13:02 -0700 |
| commit | adca8700ca1b04104be5e81f75ec4b08023a5c98 (patch) | |
| tree | d43743c49f475141873be57b3a0bec78bcc70e36 | |
| parent | b48648d6b0ac8f410d233eda7bf1ebc28d7eb89e (diff) | |
qcacld-3.0: Update MAX_SPECTRAL_CHAINS same as ATH_MAX_ANTENNA
MAX_SPECTRAL_CHAINS and IEEE80211_MAX_ANTENNA supposed to be
same as ATH_MAX_ANTENNA.
Remove the duplicate definitions of MAX_SPECTRAL_CHAINS and
Update MAX_SPECTRAL_CHAINS/IEEE80211_MAX_ANTENNA to
ATH_MAX_ANTENNA.
Change-Id: Ib5b96d6f74e1436d63ba6a6f08a93c51dc227331
CRs-Fixed: 2070722
| -rw-r--r-- | core/cds/inc/cds_ieee80211_defines.h | 2 | ||||
| -rw-r--r-- | core/mac/inc/sir_api.h | 2 | ||||
| -rw-r--r-- | core/wma/inc/wma_spectral.h | 1 | ||||
| -rw-r--r-- | uapi/linux/spectral_scan_fmt.h | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/core/cds/inc/cds_ieee80211_defines.h b/core/cds/inc/cds_ieee80211_defines.h index 6845838b32b0..3b9be119dd29 100644 --- a/core/cds/inc/cds_ieee80211_defines.h +++ b/core/cds/inc/cds_ieee80211_defines.h @@ -138,7 +138,7 @@ typedef struct ieee80211_rx_status { int rs_rateieee; int rs_ratephy; -#define IEEE80211_MAX_ANTENNA 3 /* Keep the same as ATH_MAX_ANTENNA */ +#define IEEE80211_MAX_ANTENNA 4 /* Keep the same as ATH_MAX_ANTENNA */ uint8_t rs_rssictl[IEEE80211_MAX_ANTENNA]; /* RSSI (noise floor ajusted) */ uint8_t rs_rssiextn[IEEE80211_MAX_ANTENNA]; /* RSSI (noise floor ajusted) */ uint8_t rs_isvalidrssi; /* rs_rssi is valid or not */ diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index f505d517d2e4..8f7abf005fd8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -7965,7 +7965,7 @@ struct INTERF_RSP { #define MAX_INTERF 10 /* 5 categories x (lower + upper) bands */ #define MAX_NUM_BINS 520 -#define MAX_SPECTRAL_CHAINS 3 +#define MAX_SPECTRAL_CHAINS 4 struct INTERF_SRC_RSP { uint16_t count; struct INTERF_RSP interf[MAX_INTERF]; diff --git a/core/wma/inc/wma_spectral.h b/core/wma/inc/wma_spectral.h index 2789ad72f77d..f5b8544b2ab6 100644 --- a/core/wma/inc/wma_spectral.h +++ b/core/wma/inc/wma_spectral.h @@ -26,7 +26,6 @@ #define MAX_SPECTRAL_PAYLOAD 1500 #define MAX_NUM_BINS 520 #define SPECTRAL_SIGNATURE 0xdeadbeef -#define MAX_SPECTRAL_CHAINS 3 /* Used for the SWAR to obtain approximate combined rssi * in secondary 80Mhz segment diff --git a/uapi/linux/spectral_scan_fmt.h b/uapi/linux/spectral_scan_fmt.h index 207812a47272..3b9e588cd8dc 100644 --- a/uapi/linux/spectral_scan_fmt.h +++ b/uapi/linux/spectral_scan_fmt.h @@ -31,7 +31,6 @@ #define MAX_INTERF 10 /* 5 categories x (lower + upper) bands */ #define MAX_NUM_BINS 520 -#define MAX_SPECTRAL_CHAINS 3 /** * struct INTERF_RSP_INFO - Interference source info |