staging: wfx: simplify hif_set_arp_ipv4_filter() usage

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

In add, current code for hif_set_arp_ipv4_filter() is too dumb. It
should pack data using the 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-9-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 a8082508fbfd6369cba07ce9d8fb1d8031104f97..a325c870b4ea36b729fe3d4481922960f072e17e 100644 (file)
--- a/drivers/staging/wfx/hif_tx_mib.h
+++ b/drivers/staging/wfx/hif_tx_mib.h
@@ -260,12 +260,22 @@ static inline int hif_keep_alive_period(struct wfx_vif *wvif, int period)
                             &arg, sizeof(arg));
 };
 
-static inline int hif_set_arp_ipv4_filter(struct wfx_vif *wvif,
-                                         struct hif_mib_arp_ip_addr_table *fp)
+static inline int hif_set_arp_ipv4_filter(struct wfx_vif *wvif, int idx,
+                                         __be32 *addr)
 {
+       struct hif_mib_arp_ip_addr_table arg = {
+               .condition_idx = idx,
+               .arp_enable = HIF_ARP_NS_FILTERING_DISABLE,
+       };
+
+       if (addr) {
+               // Caution: type of addr is __be32
+               memcpy(arg.ipv4_address, addr, sizeof(arg.ipv4_address));
+               arg.arp_enable = HIF_ARP_NS_FILTERING_ENABLE;
+       }
        return hif_write_mib(wvif->wdev, wvif->id,
                             HIF_MIB_ID_ARP_IP_ADDRESSES_TABLE,
-                            fp, sizeof(*fp));
+                            &arg, sizeof(arg));
 }
 
 static inline int hif_use_multi_tx_conf(struct wfx_dev *wdev,

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 339acbce96fb23ba0313240305814e31c776d2b4..8c55089b1ea4bbcaf2203c92d26d16767f126f34 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -915,30 +915,19 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw,
        struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv;
        bool do_join = false;
        int i;
-       int nb_arp_addr;
 
        mutex_lock(&wdev->conf_mutex);
 
        /* TODO: BSS_CHANGED_QOS */
        if (changed & BSS_CHANGED_ARP_FILTER) {
-               struct hif_mib_arp_ip_addr_table filter = { };
-
-               nb_arp_addr = info->arp_addr_cnt;
-               if (nb_arp_addr <= 0 || nb_arp_addr > HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES)
-                       nb_arp_addr = 0;
-
                for (i = 0; i < HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES; i++) {
-                       filter.condition_idx = i;
-                       if (i < nb_arp_addr) {
-                               // Caution: type of arp_addr_list[i] is __be32
-                               memcpy(filter.ipv4_address,
-                                      &info->arp_addr_list[i],
-                                      sizeof(filter.ipv4_address));
-                               filter.arp_enable = HIF_ARP_NS_FILTERING_ENABLE;
-                       } else {
-                               filter.arp_enable = HIF_ARP_NS_FILTERING_DISABLE;
-                       }
-                       hif_set_arp_ipv4_filter(wvif, &filter);
+                       __be32 *arp_addr = &info->arp_addr_list[i];
+
+                       if (info->arp_addr_cnt > HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES)
+                               arp_addr = NULL;
+                       if (i >= info->arp_addr_cnt)
+                               arp_addr = NULL;
+                       hif_set_arp_ipv4_filter(wvif, i, arp_addr);
                }
        }