From: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: Eugene Krasnikov
<k.eugene.e-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: wcn36xx-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Jason Mobarak <jam-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org>,
Chun-Yeow Yeoh
<yeohchunyeow-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org>
Subject: [PATCH 15/16] wcn36xx: don't pad beacons for mesh
Date: Mon, 28 Mar 2016 23:06:32 -0700 [thread overview]
Message-ID: <1459231593-360-16-git-send-email-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <1459231593-360-1-git-send-email-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
From: Jason Mobarak <jam-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org>
Patch "wcn36xx: Pad TIM PVM if needed" has caused a regression in mesh
beaconing. The field tim_off is always 0 for mesh mode, and thus
pvm_len (referring to the TIM length field) and pad are both incorrectly
calculated. Thus, msg_body.beacon_length is incorrectly calculated for
mesh mode. Fix this.
Signed-off-by: Jason Mobarak <jam-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/net/wireless/ath/wcn36xx/smd.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index a57d158298a1..b1bdc229e560 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -1410,6 +1410,11 @@ int wcn36xx_smd_send_beacon(struct wcn36xx *wcn, struct ieee80211_vif *vif,
pvm_len = skb_beacon->data[tim_off + 1] - 3;
pad = TIM_MIN_PVM_SIZE - pvm_len;
+
+ /* Padding is irrelevant to mesh mode since tim_off is always 0. */
+ if (vif->type == NL80211_IFTYPE_MESH_POINT)
+ pad = 0;
+
msg_body.beacon_length = skb_beacon->len + pad;
/* TODO need to find out why + 6 is needed */
msg_body.beacon_length6 = msg_body.beacon_length + 6;
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-03-29 6:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 6:06 [PATCH 00/16] Misc wcn36xx fixes Bjorn Andersson
2016-03-29 6:06 ` [PATCH 01/16] wcn36xx: Clean up wcn36xx_smd_send_beacon Bjorn Andersson
2016-03-29 6:06 ` [PATCH 02/16] wcn36xx: Pad TIM PVM if needed Bjorn Andersson
2016-03-29 6:06 ` [PATCH 04/16] wcn36xx: Use consistent name for private vif Bjorn Andersson
2016-03-29 6:06 ` [PATCH 05/16] wcn36xx: Use define for invalid index and fix typo Bjorn Andersson
2016-03-29 6:06 ` [PATCH 06/16] wcn36xx: Fetch private sta data from sta entry instead of from vif Bjorn Andersson
2016-03-29 17:01 ` kbuild test robot
2016-03-29 21:37 ` Bjorn Andersson
2016-03-30 5:18 ` Kalle Valo
2016-03-29 6:06 ` [PATCH 07/16] wcn36xx: Add helper macros to cast sta to priv Bjorn Andersson
2016-03-29 6:06 ` [PATCH 08/16] wcn36xx: Remove sta pointer in private vif struct Bjorn Andersson
[not found] ` <1459231593-360-1-git-send-email-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-03-29 6:06 ` [PATCH 03/16] wcn36xx: Add helper macros to cast vif to private vif and vice versa Bjorn Andersson
2016-03-29 6:06 ` [PATCH 09/16] wcn36xx: Parse trigger_ba response properly Bjorn Andersson
2016-03-29 6:06 ` [PATCH 10/16] wcn36xx: Copy all members in config_sta v1 conversion Bjorn Andersson
2016-03-29 6:06 ` [PATCH 14/16] wcn36xx: Implement multicast filtering Bjorn Andersson
2016-03-29 6:06 ` Bjorn Andersson [this message]
2016-03-29 12:45 ` [PATCH 15/16] wcn36xx: don't pad beacons for mesh Sergei Shtylyov
2016-03-29 21:41 ` [RESEND PATCH " Bjorn Andersson
[not found] ` <1459287672-3324-1-git-send-email-bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-03-29 21:44 ` Bjorn Andersson
2016-03-29 6:06 ` [PATCH 11/16] wcn36xx: Use allocated self sta index instead of hard coded Bjorn Andersson
2016-03-29 6:06 ` [PATCH 12/16] wcn36xx: Clear encrypt_type when deleting bss key Bjorn Andersson
2016-03-29 6:06 ` [PATCH 13/16] wcn36xx: Track association state Bjorn Andersson
2016-03-29 6:06 ` [PATCH 16/16] wcn36xx: Use correct command struct for EXIT_BMPS_REQ Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459231593-360-16-git-send-email-bjorn.andersson@linaro.org \
--to=bjorn.andersson-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
--cc=jam-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org \
--cc=k.eugene.e-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=wcn36xx-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=yeohchunyeow-W/OLz77bvjtBDgjK7y7TUQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).