Commit e52e68ee authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

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: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-9-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ed8b0d0

drivers/staging/wfx/hif_tx_mib.h

+13 −3
Original line number Original line Diff line number Diff line
@@ -260,12 +260,22 @@ static inline int hif_keep_alive_period(struct wfx_vif *wvif, int period) 
			     &arg, sizeof(arg));

			     &arg, sizeof(arg));

};

};





static inline int hif_set_arp_ipv4_filter(struct wfx_vif *wvif,

static inline int hif_set_arp_ipv4_filter(struct wfx_vif *wvif, int idx,

					  struct hif_mib_arp_ip_addr_table *fp)

					  __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,

	return hif_write_mib(wvif->wdev, wvif->id,

			     HIF_MIB_ID_ARP_IP_ADDRESSES_TABLE,

			     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,

static inline int hif_use_multi_tx_conf(struct wfx_dev *wdev,

drivers/staging/wfx/sta.c

+7 −18
Original line number Original line Diff line number Diff line
@@ -915,30 +915,19 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, 
	struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv;

	struct wfx_vif *wvif = (struct wfx_vif *) vif->drv_priv;

	bool do_join = false;

	bool do_join = false;

	int i;

	int i;

	int nb_arp_addr;





	mutex_lock(&wdev->conf_mutex);

	mutex_lock(&wdev->conf_mutex);





	/* TODO: BSS_CHANGED_QOS */

	/* TODO: BSS_CHANGED_QOS */

	if (changed & BSS_CHANGED_ARP_FILTER) {

	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++) {

		for (i = 0; i < HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES; i++) {

			filter.condition_idx = i;

			__be32 *arp_addr = &info->arp_addr_list[i];

			if (i < nb_arp_addr) {



				// Caution: type of arp_addr_list[i] is __be32

			if (info->arp_addr_cnt > HIF_MAX_ARP_IP_ADDRTABLE_ENTRIES)

				memcpy(filter.ipv4_address,

				arp_addr = NULL;

				       &info->arp_addr_list[i],

			if (i >= info->arp_addr_cnt)

				       sizeof(filter.ipv4_address));

				arp_addr = NULL;

				filter.arp_enable = HIF_ARP_NS_FILTERING_ENABLE;

			hif_set_arp_ipv4_filter(wvif, i, arp_addr);

			} else {

				filter.arp_enable = HIF_ARP_NS_FILTERING_DISABLE;

			}

			hif_set_arp_ipv4_filter(wvif, &filter);

		}

		}

	}

	}