Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4c62506 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Sync struct ath9k_htc_target_vif with FW 



Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b97c57ff

drivers/net/wireless/ath/ath9k/htc.h

+3 −9
Original line number Original line Diff line number Diff line
@@ -117,17 +117,11 @@ struct ath9k_htc_cap_target { 




struct ath9k_htc_target_vif {

struct ath9k_htc_target_vif {

	u8 index;

	u8 index;

	u8 des_bssid[ETH_ALEN];

	u8 opmode;

	__be32 opmode;

	u8 myaddr[ETH_ALEN];

	u8 myaddr[ETH_ALEN];

	u8 bssid[ETH_ALEN];

	u32 flags;

	u32 flags_ext;

	u16 ps_sta;

	__be16 rtsthreshold;

	u8 ath_cap;

	u8 ath_cap;

	u8 node;

	__be16 rtsthreshold;

	s8 mcast_rate;

	u8 pad;

} __packed;

} __packed;





#define ATH_HTC_STA_AUTH  0x0001

#define ATH_HTC_STA_AUTH  0x0001

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv) 
	memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif));

	memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif));

	memcpy(&hvif.myaddr, common->macaddr, ETH_ALEN);

	memcpy(&hvif.myaddr, common->macaddr, ETH_ALEN);





	hvif.opmode = cpu_to_be32(HTC_M_MONITOR);

	hvif.opmode = HTC_M_MONITOR;

	hvif.index = ffz(priv->vif_slot);

	hvif.index = ffz(priv->vif_slot);





	WMI_CMD_BUF(WMI_VAP_CREATE_CMDID, &hvif);

	WMI_CMD_BUF(WMI_VAP_CREATE_CMDID, &hvif);
@@ -1039,13 +1039,13 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, 




	switch (vif->type) {

	switch (vif->type) {

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_STATION:

		hvif.opmode = cpu_to_be32(HTC_M_STA);

		hvif.opmode = HTC_M_STA;

		break;

		break;

	case NL80211_IFTYPE_ADHOC:

	case NL80211_IFTYPE_ADHOC:

		hvif.opmode = cpu_to_be32(HTC_M_IBSS);

		hvif.opmode = HTC_M_IBSS;

		break;

		break;

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_AP:

		hvif.opmode = cpu_to_be32(HTC_M_HOSTAP);

		hvif.opmode = HTC_M_HOSTAP;

		break;

		break;

	default:

	default:

		ath_err(common,

		ath_err(common,