ath10k: use ieee80211 NoA definitions
PATCH 1/2 ath10k: use ieee80211 NoA definitions
Remove internal types definition and
use ieee80211/cfg80211 notice of absence definitions.
Signed-off-by Janusz Dziedzic <[email protected]>
--- drivers/net/wireless/ath/ath10k/wmi.c | 10 +++++----- drivers/net/wireless/ath/ath10k/wmi.h | 18 ------------------ 2 files changed, 5 insertions(+), 23 deletions(-)
drivers/net/wireless/ath/ath10k/wmi.c +5 -5
@@ -538,7 +538,7 @@ static void ath10k_wmi_update_tim(struct ath10k *ar, struct ath10k_vif *arvif,static void ath10k_p2p_fill_noa_ie (u8 *data,u32 len,struct wmi_p2p_noa_info *noa) { -struct ath10k_p2p_noa_attr *noa_attr; +struct ieee80211_p2p_noa_attr *noa_attr;u8 ctwindow_oppps = noa->ctwindow_oppps;u8 ctwindow = ctwindow_oppps >>WMI_P2P_OPPPS_CTWINDOW_OFFSET ;bool oppps = !!(ctwindow_oppps &WMI_P2P_OPPPS_ENABLE_BIT );
@@ -558,12 +558,12 @@ static void ath10k_p2p_fill_noa_ie(u8 *data, u32 len,/* NOA ATTR */ data[6 ] =IEEE80211_P2P_ATTR_ABSENCE_NOTICE ; noa_attr_len = (__le16 *) &data[7 ];/* 2 bytes */ - noa_attr = (struct ath10k_p2p_noa_attr *) &data[9 ]; + noa_attr = (struct ieee80211_p2p_noa_attr *) &data[9 ]; noa_attr->index = noa->index; noa_attr->oppps_ctwindow = ctwindow;if (oppps) - noa_attr->oppps_ctwindow |=ATH10K_P2P_OPPPS_ENABLE_BIT ; + noa_attr->oppps_ctwindow |=IEEE80211_P2P_OPPPS_ENABLE_BIT ;for (i =0 ; i < noa_descriptors; i++) { noa_attr->desc[i].count =
@@ -575,7 +575,7 @@ static void ath10k_p2p_fill_noa_ie(u8 *data, u32 len, } attr_len =2 ;/* index + oppps_ctwindow */ - attr_len += noa_descriptors *sizeof (struct ath10k_p2p_noa_desc ); + attr_len += noa_descriptors *sizeof (struct ieee80211_p2p_noa_desc ); *noa_attr_len =__cpu_to_le16 (attr_len); }
@@ -593,7 +593,7 @@ static u32 ath10k_p2p_calc_noa_ie_len(struct wmi_p2p_noa_info *noa) len +=1 +1 +4 ;/* EID + len + OUI */ len +=1 +2 ;/* noa attr + attr len */ len +=1 +1 ;/* index + oppps_ctwindow */ - len += noa_descriptors *sizeof (struct ath10k_p2p_noa_desc ); + len += noa_descriptors *sizeof (struct ieee80211_p2p_noa_desc );return len; }
drivers/net/wireless/ath/ath10k/wmi.h +0 -18
@@ -2766,24 +2766,6 @@ struct wmi_add_bcn_filter_cmd {/* By default disable power save for IBSS */ #define ATH10K_DEFAULT_ATIM 0 - -/* TODO to be removed when cfg80211 changes will be merged: -cfg80211: add P2P Notice of Absence attribute */ -struct ath10k_p2p_noa_desc { -u8 count; -__le32 duration; -__le32 interval; -__le32 start_time; -} __packed; - -struct ath10k_p2p_noa_attr { -u8 index; -u8 oppps_ctwindow; -struct ath10k_p2p_noa_desc desc[4 ]; -} __packed; - -#define ATH10K_P2P_OPPPS_ENABLE_BIT BIT(7) -struct ath10k ;struct ath10k_vif ;
Signature · 1 line
1.7.9.5
PATCH 2/2 ath10k: WMI wmi_bcn_info update
Sync with FW ver .614 - wmi_bcn_info structure.
Signed-off-by Janusz Dziedzic <[email protected]>
--- drivers/net/wireless/ath/ath10k/wmi.h | 9 --------- 1 file changed, 9 deletions(-)
drivers/net/wireless/ath/ath10k/wmi.h +0 -9
@@ -2408,14 +2408,6 @@ struct wmi_tim_info {__le32 tim_num_ps_pending; } __packed; -struct wmi_quiet_info { -__le32 is_enabled; -__le32 tbttcount; -__le32 period; -__le32 duration; -__le32 offset; -} __packed; -/* Maximum number of NOA Descriptors supported */ #define WMI_P2P_MAX_NOA_DESCRIPTORS 4#define WMI_P2P_OPPPS_ENABLE_BIT BIT(0)
@@ -2439,7 +2431,6 @@ struct wmi_p2p_noa_info {struct wmi_bcn_info {struct wmi_tim_info tim_info; -struct wmi_quiet_info quiet_info;struct wmi_p2p_noa_info p2p_noa_info; } __packed;
Signature · 1 line
1.7.9.5
PATCH 1/2 ath10k: use ieee80211 NoA definitions
In reply to Janusz DziedzicQuoted 4 lines · Janusz Dziedzic
Remove internal types definition and
use ieee80211/cfg80211 notice of absence definitions.Signed-off-by Janusz Dziedzic <[email protected]>
Thanks, both applied.
Signature · 1 line
Kalle Valo