diff options
| author | Thomas Pedersen <c_tpeder@qca.qualcomm.com> | 2012-08-20 17:26:50 -0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-10-24 04:49:47 -0400 |
| commit | 2c07cf4461c958e52efd9cfca1df67165426ba20 (patch) | |
| tree | fa210b48e4b8b6ca7191c2a28ace204d116e48be /drivers/net/wireless/ath | |
| parent | b1f47e3a962b8b69612d1eecf4d50082b402fcc5 (diff) | |
ath6kl: consolidate WoW pattern length
Since WOW_MASK_SIZE and WOW_PATTERN_SIZE have the same value, are
logically equivalent, and part of the WMI API so therefore unlikely to
change, consolidate these into WOW_PATTERN_SIZE.
Reported-by Kalle Valo <kvalo@qualcomm.com>
Signed-off-by: Thomas Pedersen <c_tpeder@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 850c94f6ebc..a7c8ff084c4 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c | |||
| @@ -1870,7 +1870,7 @@ static int ath6kl_wow_usr(struct ath6kl *ar, struct ath6kl_vif *vif, | |||
| 1870 | struct cfg80211_wowlan *wow, u32 *filter) | 1870 | struct cfg80211_wowlan *wow, u32 *filter) |
| 1871 | { | 1871 | { |
| 1872 | int ret, pos; | 1872 | int ret, pos; |
| 1873 | u8 mask[WOW_MASK_SIZE]; | 1873 | u8 mask[WOW_PATTERN_SIZE]; |
| 1874 | u16 i; | 1874 | u16 i; |
| 1875 | 1875 | ||
| 1876 | /* Configure the patterns that we received from the user. */ | 1876 | /* Configure the patterns that we received from the user. */ |
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index a791b1bbe0c..a638151cf86 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h | |||
| @@ -2062,7 +2062,6 @@ struct wmi_set_ie_cmd { | |||
| 2062 | 2062 | ||
| 2063 | #define WOW_MAX_FILTERS_PER_LIST 4 | 2063 | #define WOW_MAX_FILTERS_PER_LIST 4 |
| 2064 | #define WOW_PATTERN_SIZE 64 | 2064 | #define WOW_PATTERN_SIZE 64 |
| 2065 | #define WOW_MASK_SIZE 64 | ||
| 2066 | 2065 | ||
| 2067 | #define MAC_MAX_FILTERS_PER_LIST 4 | 2066 | #define MAC_MAX_FILTERS_PER_LIST 4 |
| 2068 | 2067 | ||
| @@ -2071,7 +2070,7 @@ struct wow_filter { | |||
| 2071 | u8 wow_filter_id; | 2070 | u8 wow_filter_id; |
| 2072 | u8 wow_filter_size; | 2071 | u8 wow_filter_size; |
| 2073 | u8 wow_filter_offset; | 2072 | u8 wow_filter_offset; |
| 2074 | u8 wow_filter_mask[WOW_MASK_SIZE]; | 2073 | u8 wow_filter_mask[WOW_PATTERN_SIZE]; |
| 2075 | u8 wow_filter_pattern[WOW_PATTERN_SIZE]; | 2074 | u8 wow_filter_pattern[WOW_PATTERN_SIZE]; |
| 2076 | } __packed; | 2075 | } __packed; |
| 2077 | 2076 | ||