staging: wfx: simplify hif_set_data_filtering()

The structure hif_mib_set_data_filtering come from hardware API. It is
not intended to be manipulated in upper layers of the driver.

In add, current code for hif_set_data_filtering() is too dumb. It should
pack data with hardware representation instead of leaving all work to
the caller.

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

diff --git a/drivers/staging/wfx/hif_tx_mib.h b/drivers/staging/wfx/hif_tx_mib.h
index 6e8b050..ee22c71 100644 (file)
--- a/drivers/staging/wfx/hif_tx_mib.h
+++ b/drivers/staging/wfx/hif_tx_mib.h
@@ -267,10 +267,15 @@ static inline int hif_set_config_data_filter(struct wfx_vif *wvif,
 }
 
 static inline int hif_set_data_filtering(struct wfx_vif *wvif,
-                                        struct hif_mib_set_data_filtering *arg)
+                                        bool enable, bool invert)
 {
+       struct hif_mib_set_data_filtering val = {
+               .enable = enable,
+               .invert_matching = invert,
+       };
+
        return hif_write_mib(wvif->wdev, wvif->id,
-                            HIF_MIB_ID_SET_DATA_FILTERING, arg, sizeof(*arg));
+                            HIF_MIB_ID_SET_DATA_FILTERING, &val, sizeof(val));
 }
 
 static inline int hif_keep_alive_period(struct wfx_vif *wvif, int period)

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 27248ea..5880944 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -118,16 +118,13 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
 {
        int i, ret;
        struct hif_mib_config_data_filter config = { };
-       struct hif_mib_set_data_filtering filter_data = { };
        struct hif_mib_mac_addr_data_frame_condition filter_addr_val = { };
 
        // Temporary workaround for filters
-       return hif_set_data_filtering(wvif, &filter_data);
+       return hif_set_data_filtering(wvif, false, true);
 
-       if (!fp->enable) {
-               filter_data.enable = 0;
-               return hif_set_data_filtering(wvif, &filter_data);
-       }
+       if (!fp->enable)
+               return hif_set_data_filtering(wvif, false, true);
 
        // A1 Address match on list
        for (i = 0; i < fp->num_addresses; i++) {
@@ -154,9 +151,7 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
        if (ret)
                return ret;
 
-       filter_data.enable = 1;
-       filter_data.invert_matching = 1; // discard all but matching frames
-       ret = hif_set_data_filtering(wvif, &filter_data);
+       ret = hif_set_data_filtering(wvif, true, true);
 
        return ret;
 }