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

staging: wfx: relocate LINK_ID_NO_ASSOC and MAX_STA_IN_AP_MODE to hif API 



The definitions LINK_ID_NO_ASSOC and MAX_STA_IN_AP_MODE are imposed by
the hardware. Therefore, they should be located in the hardware
interface API.

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


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

drivers/staging/wfx/data_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static u8 wfx_tx_get_link_id(struct wfx_vif *wvif, struct ieee80211_sta *sta, 
		return 0;

	if (is_multicast_ether_addr(da))

		return 0;

	return WFX_LINK_ID_NO_ASSOC;

	return HIF_LINK_ID_NOT_ASSOCIATED;

}



static void wfx_tx_fixup_rates(struct ieee80211_tx_rate *rates)

drivers/staging/wfx/hif_api_cmd.h

+3 −0
Original line number Diff line number Diff line
@@ -480,6 +480,9 @@ struct hif_cnf_beacon_transmit { 
	u32   status;

} __packed;



#define HIF_LINK_ID_MAX            14

#define HIF_LINK_ID_NOT_ASSOCIATED (HIF_LINK_ID_MAX + 1)



enum hif_sta_map_direction {

	HIF_STA_MAP                       = 0x0,

	HIF_STA_UNMAP                     = 0x1

drivers/staging/wfx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ struct wfx_dev *wfx_init_common(struct device *dev, 
	hw->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;

	hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD;

	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

	hw->wiphy->max_ap_assoc_sta = WFX_MAX_STA_IN_AP_MODE;

	hw->wiphy->max_ap_assoc_sta = HIF_LINK_ID_MAX;

	hw->wiphy->max_scan_ssids = 2;

	hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;

	hw->wiphy->n_iface_combinations = ARRAY_SIZE(wfx_iface_combinations);

drivers/staging/wfx/queue.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 


#include "hif_api_cmd.h"



#define WFX_MAX_STA_IN_AP_MODE    14

#define WFX_LINK_ID_NO_ASSOC      15



struct wfx_dev;

struct wfx_vif;

drivers/staging/wfx/sta.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	sta_priv->link_id = ffz(wvif->link_id_map);

	wvif->link_id_map |= BIT(sta_priv->link_id);

	WARN_ON(!sta_priv->link_id);

	WARN_ON(sta_priv->link_id >= WFX_MAX_STA_IN_AP_MODE);

	WARN_ON(sta_priv->link_id >= HIF_LINK_ID_MAX);

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



	return 0;