staging: wfx: simplify hif_mib_set_data_filtering

The field "default_filter" was not obvious.

In add, explicitly declare that fields default_filter and enable are
booleans.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-34-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 e0ef0337e01c7e6b98d879f39c35cbcaa99f48a0..0c67cd4c159302c2a5db16f021dc119b51c7f943 100644 (file)
--- a/drivers/staging/wfx/hif_api_mib.h
+++ b/drivers/staging/wfx/hif_api_mib.h
@@ -206,9 +206,11 @@ struct hif_mib_config_data_filter {
 } __packed;
 
 struct hif_mib_set_data_filtering {
-       u8    default_filter;
-       u8    enable;
-       u8    reserved[2];
+       u8    invert_matching:1;
+       u8    reserved1:7;
+       u8    enable:1;
+       u8    reserved2:7;
+       u8    reserved3[2];
 } __packed;
 
 enum hif_arp_ns_frame_treatment {

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 1c1b5a6c2474383a15d862ad9d656bb4531e1da2..27248ea62aeab728bd43f27df05a92a4de1b22b4 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -154,9 +154,8 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
        if (ret)
                return ret;
 
-       // discard all data frames except match filter
        filter_data.enable = 1;
-       filter_data.default_filter = 1; // discard all
+       filter_data.invert_matching = 1; // discard all but matching frames
        ret = hif_set_data_filtering(wvif, &filter_data);
 
        return ret;