From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Eugene Krasnikov <k.eugene.e@gmail.com>,
Kalle Valo <kvalo@codeaurora.org>
Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Pontus Fuchs <pontus.fuchs@gmail.com>
Subject: [PATCH 01/16] wcn36xx: Clean up wcn36xx_smd_send_beacon
Date: Mon, 28 Mar 2016 23:06:18 -0700 [thread overview]
Message-ID: <1459231593-360-2-git-send-email-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <1459231593-360-1-git-send-email-bjorn.andersson@linaro.org>
From: Pontus Fuchs <pontus.fuchs@gmail.com>
Needed for coming improvements. No functional changes.
Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/net/wireless/ath/wcn36xx/hal.h | 7 +++++--
drivers/net/wireless/ath/wcn36xx/smd.c | 12 +++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h
index b947de0fb2e5..4fd77ccc2287 100644
--- a/drivers/net/wireless/ath/wcn36xx/hal.h
+++ b/drivers/net/wireless/ath/wcn36xx/hal.h
@@ -51,8 +51,8 @@
#define WALN_HAL_STA_INVALID_IDX 0xFF
#define WCN36XX_HAL_BSS_INVALID_IDX 0xFF
-/* Default Beacon template size */
-#define BEACON_TEMPLATE_SIZE 0x180
+/* Default Beacon template size. */
+#define BEACON_TEMPLATE_SIZE 0x17C
/* Param Change Bitmap sent to HAL */
#define PARAM_BCN_INTERVAL_CHANGED (1 << 0)
@@ -2884,6 +2884,9 @@ struct update_beacon_rsp_msg {
struct wcn36xx_hal_send_beacon_req_msg {
struct wcn36xx_hal_msg_header header;
+ /* length of the template + 6. Only qcom knows why */
+ u32 beacon_length6;
+
/* length of the template. */
u32 beacon_length;
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index 74f56a81ad9a..ff3ed2461a69 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -1380,19 +1380,17 @@ int wcn36xx_smd_send_beacon(struct wcn36xx *wcn, struct ieee80211_vif *vif,
mutex_lock(&wcn->hal_mutex);
INIT_HAL_MSG(msg_body, WCN36XX_HAL_SEND_BEACON_REQ);
- /* TODO need to find out why this is needed? */
- msg_body.beacon_length = skb_beacon->len + 6;
+ msg_body.beacon_length = skb_beacon->len;
+ /* TODO need to find out why + 6 is needed */
+ msg_body.beacon_length6 = msg_body.beacon_length + 6;
- if (BEACON_TEMPLATE_SIZE > msg_body.beacon_length) {
- memcpy(&msg_body.beacon, &skb_beacon->len, sizeof(u32));
- memcpy(&(msg_body.beacon[4]), skb_beacon->data,
- skb_beacon->len);
- } else {
+ if (msg_body.beacon_length > BEACON_TEMPLATE_SIZE) {
wcn36xx_err("Beacon is to big: beacon size=%d\n",
msg_body.beacon_length);
ret = -ENOMEM;
goto out;
}
+ memcpy(msg_body.beacon, skb_beacon->data, skb_beacon->len);
memcpy(msg_body.bssid, vif->addr, ETH_ALEN);
/* TODO need to find out why this is needed? */
--
2.5.0
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 ` Bjorn Andersson [this message]
2016-03-29 6:06 ` [PATCH 02/16] wcn36xx: Pad TIM PVM if needed 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 ` [PATCH 15/16] wcn36xx: don't pad beacons for mesh Bjorn Andersson
2016-03-29 12:45 ` 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 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
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-2-git-send-email-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=k.eugene.e@gmail.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pontus.fuchs@gmail.com \
--cc=wcn36xx@lists.infradead.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).