Remove internal types definition and
use ieee80211/cfg80211 notice of absence definitions.
Signed-off-by: Janusz Dziedzic <janusz.dzied...@tieto.com>
---
drivers/net/wireless/ath/ath10k/wmi.c | 10 +++++-----
drivers/net/wireless/ath/ath10k/wmi.h | 18 ------------------
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c
b/drivers/net/wireless/ath/ath10k/wmi.c
index 8d542e5..2d4c7d9 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -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;
}
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h
b/drivers/net/wireless/ath/ath10k/wmi.h
index 9946a51..986f0c1 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -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;
--
1.7.9.5
_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel
