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

staging: wfx: improve usage of hif_map_link() 



Until now, hif_map_link() get as argument the raw value for
map_link_flags when map_link_flags is defined as a bitfield. It was
error prone.

Now hif_map_link() takes explicit value for every flags of the
struct map_link_flags.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200825085828.399505-2-Jerome.Pouiller@silabs.com


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

drivers/staging/wfx/hif_tx.c

+3 −2
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ int hif_beacon_transmit(struct wfx_vif *wvif, bool enable) 
	return ret;

}



int hif_map_link(struct wfx_vif *wvif, u8 *mac_addr, int flags, int sta_id)

int hif_map_link(struct wfx_vif *wvif, bool unmap, u8 *mac_addr, int sta_id, bool mfp)

{

	int ret;

	struct hif_msg *hif;
@@ -509,7 +509,8 @@ int hif_map_link(struct wfx_vif *wvif, u8 *mac_addr, int flags, int sta_id) 
		return -ENOMEM;

	if (mac_addr)

		ether_addr_copy(body->mac_addr, mac_addr);

	body->map_link_flags = *(struct hif_map_link_flags *)&flags;

	body->map_link_flags.mfpc = mfp ? 1 : 0;

	body->map_link_flags.map_direction = unmap ? 1 : 0;

	body->peer_sta_id = sta_id;

	wfx_fill_header(hif, wvif->id, HIF_REQ_ID_MAP_LINK, sizeof(*body));

	ret = wfx_cmd_send(wvif->wdev, hif, NULL, 0, false);

drivers/staging/wfx/hif_tx.h

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ int hif_set_edca_queue_params(struct wfx_vif *wvif, u16 queue, 
int hif_start(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf,

	      const struct ieee80211_channel *channel);

int hif_beacon_transmit(struct wfx_vif *wvif, bool enable);

int hif_map_link(struct wfx_vif *wvif, u8 *mac_addr, int flags, int sta_id);

int hif_map_link(struct wfx_vif *wvif,

		 bool unmap, u8 *mac_addr, int sta_id, bool mfp);

int hif_update_ie_beacon(struct wfx_vif *wvif, const u8 *ies, size_t ies_len);

int hif_sl_set_mac_key(struct wfx_dev *wdev,

		       const u8 *slk_key, int destination);

drivers/staging/wfx/sta.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	wvif->link_id_map |= BIT(sta_priv->link_id);

	WARN_ON(!sta_priv->link_id);

	WARN_ON(sta_priv->link_id >= HIF_LINK_ID_MAX);

	hif_map_link(wvif, sta->addr, sta->mfp ? 2 : 0, sta_priv->link_id);

	hif_map_link(wvif, false, sta->addr, sta_priv->link_id, sta->mfp);



	return 0;

}
@@ -449,7 +449,7 @@ int wfx_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	if (!sta_priv->link_id)

		return 0;

	// FIXME add a mutex?

	hif_map_link(wvif, sta->addr, 1, sta_priv->link_id);

	hif_map_link(wvif, true, sta->addr, sta_priv->link_id, false);

	wvif->link_id_map &= ~BIT(sta_priv->link_id);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE