ath6kl: consolidate WoW pattern length
authorThomas Pedersen <c_tpeder@qca.qualcomm.com>
Mon, 20 Aug 2012 21:26:50 +0000 (14:26 -0700)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 24 Oct 2012 08:49:47 +0000 (11:49 +0300)
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>
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/wmi.h

index 850c94f6ebc8f222307f94bd39c2d07788a7125b..a7c8ff084c46fe0658ef1dace8ebec1cf14f1356 100644 (file)
@@ -1870,7 +1870,7 @@ static int ath6kl_wow_usr(struct ath6kl *ar, struct ath6kl_vif *vif,
                          struct cfg80211_wowlan *wow, u32 *filter)
 {
        int ret, pos;
-       u8 mask[WOW_MASK_SIZE];
+       u8 mask[WOW_PATTERN_SIZE];
        u16 i;
 
        /* Configure the patterns that we received from the user. */
index a791b1bbe0cda5b131b97bde5ec14702b0e091e1..a638151cf8619b53932d72ebb3e576f5dfd59127 100644 (file)
@@ -2062,7 +2062,6 @@ struct wmi_set_ie_cmd {
 
 #define WOW_MAX_FILTERS_PER_LIST 4
 #define WOW_PATTERN_SIZE        64
-#define WOW_MASK_SIZE           64
 
 #define MAC_MAX_FILTERS_PER_LIST 4
 
@@ -2071,7 +2070,7 @@ struct wow_filter {
        u8 wow_filter_id;
        u8 wow_filter_size;
        u8 wow_filter_offset;
-       u8 wow_filter_mask[WOW_MASK_SIZE];
+       u8 wow_filter_mask[WOW_PATTERN_SIZE];
        u8 wow_filter_pattern[WOW_PATTERN_SIZE];
 } __packed;