staging: wfx: simplify hif_mib_uc_mc_bc_data_frame_condition

The current API defines bitfields. It is not very convenient. Prefer to
use bitmasks.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-33-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/hif_api_mib.h b/drivers/staging/wfx/hif_api_mib.h
index 1603b3074bf7c5cd35fe8bb8e96157803a66256c..e0ef0337e01c7e6b98d879f39c35cbcaa99f48a0 100644 (file)
--- a/drivers/staging/wfx/hif_api_mib.h
+++ b/drivers/staging/wfx/hif_api_mib.h
@@ -181,19 +181,13 @@ struct hif_mib_ipv6_addr_data_frame_condition {
        u8    i_pv6_address[HIF_API_IPV6_ADDRESS_SIZE];
 } __packed;
 
-union hif_addr_type {
-       u8 value;
-       struct {
-               u8    type_unicast:1;
-               u8    type_multicast:1;
-               u8    type_broadcast:1;
-               u8    reserved:5;
-       } bits;
-};
+#define HIF_FILTER_UNICAST   0x1
+#define HIF_FILTER_MULTICAST 0x2
+#define HIF_FILTER_BROADCAST 0x4
 
 struct hif_mib_uc_mc_bc_data_frame_condition {
        u8    condition_idx;
-       union hif_addr_type param;
+       u8    allowed_frames;
        u8    reserved[2];
 } __packed;
 

diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h
index 4d171e6cfc9a5dba1f6439a1c4654435f2fe3019..6e8b050cbc257c7a52daf1784d9be50f768b616c 100644 (file)
--- a/drivers/staging/wfx/hif_tx_mib.h
+++ b/drivers/staging/wfx/hif_tx_mib.h
@@ -246,15 +246,12 @@ static inline int hif_set_mac_addr_condition(struct wfx_vif *wvif,
                             arg, sizeof(*arg));
 }
 
-// FIXME: use a bitfield instead of 3 boolean values
-static inline int hif_set_uc_mc_bc_condition(struct wfx_vif *wvif, int idx,
-                                            bool unic, bool multic, bool broadc)
+static inline int hif_set_uc_mc_bc_condition(struct wfx_vif *wvif,
+                                            int idx, u8 allowed_frames)
 {
        struct hif_mib_uc_mc_bc_data_frame_condition val = {
                .condition_idx = idx,
-               .param.bits.type_unicast = unic,
-               .param.bits.type_multicast = multic,
-               .param.bits.type_broadcast = broadc,
+               .allowed_frames = allowed_frames,
        };
 
        return hif_write_mib(wvif->wdev, wvif->id,

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 79285927c7bf11a7d52a7be924533d8d6c352cd2..1c1b5a6c2474383a15d862ad9d656bb4531e1da2 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -142,8 +142,8 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
                config.mac_cond |= 1 << i;
        }
 
-       // Accept unicast and broadcast
-       ret = hif_set_uc_mc_bc_condition(wvif, 0, true, false, true);
+       ret = hif_set_uc_mc_bc_condition(wvif, 0, HIF_FILTER_UNICAST |
+                                                 HIF_FILTER_BROADCAST);
        if (ret)
                return ret;