UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath10k: use vif->type and vif->p2p for P2P_GO check 

Interface type P2P_GO can be checked by either arvif->vdev_type
and arvif->vdev_subtype or vif->type and vif->p2p.
Use later one to avoid more cpu consumption that could happen
when subtype abstraction layer change is introduced.

Signed-off-by: Peter Oh <poh@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Peter Oh 2016-01-28 13:54:09 -08:00 committed by Kalle Valo
parent e70e9ba9df
commit 08c27be1db
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/ath10k/mac.c
View File

@ -1358,10 +1358,7 @@ static int ath10k_mac_setup_bcn_p2p_ie(struct ath10k_vif *arvif,
const u8 *p2p_ie; const u8 *p2p_ie;
int ret; int ret;
if (arvif->vdev_type != WMI_VDEV_TYPE_AP) if (arvif->vif->type != NL80211_IFTYPE_AP || !arvif->vif->p2p)
return 0;
if (arvif->vdev_subtype != WMI_VDEV_SUBTYPE_P2P_GO)
return 0; return 0;
mgmt = (void *)bcn->data; mgmt = (void *)bcn->data;
@ -3259,8 +3256,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
/* This is case only for P2P_GO */ /* This is case only for P2P_GO */
if (arvif->vdev_type != WMI_VDEV_TYPE_AP || if (vif->type != NL80211_IFTYPE_AP || !vif->p2p)
arvif->vdev_subtype != WMI_VDEV_SUBTYPE_P2P_GO)
return; return;
if (unlikely(ieee80211_is_probe_resp(hdr->frame_control))) { if (unlikely(ieee80211_is_probe_resp(hdr->frame_control))) {

2
drivers/net/wireless/ath/ath10k/wmi.c
View File

@ -3196,7 +3196,7 @@ static void ath10k_wmi_update_noa(struct ath10k *ar, struct ath10k_vif *arvif,
struct sk_buff *bcn, struct sk_buff *bcn,
const struct wmi_p2p_noa_info *noa) const struct wmi_p2p_noa_info *noa)
{ {
if (arvif->vdev_subtype != WMI_VDEV_SUBTYPE_P2P_GO) if (!arvif->vif->p2p)
return; return;
ath10k_dbg(ar, ATH10K_DBG_MGMT, "noa changed: %d\n", noa->changed); ath10k_dbg(ar, ATH10K_DBG_MGMT, "noa changed: %d\n", noa->changed);