diff mbox

[03/10] brcmfmac: Fix extra data support handling.

Message ID 1347283018-24223-4-git-send-email-arend@broadcom.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Arend van Spriel Sept. 10, 2012, 1:16 p.m. UTC 
From: Hante Meuleman <meuleman@broadcom.com>

This patch fixes bug in length calculation.

Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Florian Fainelli Sept. 10, 2012, 4:37 p.m. UTC | #1 
Hello,

On Monday 10 September 2012 15:16:51 Arend van Spriel wrote:
> From: Hante Meuleman <meuleman@broadcom.com>
> 
> This patch fixes bug in length calculation.
> 
> Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
> Reviewed-by: Arend Van Spriel <arend@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
>  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c 
b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
> index 6383052..4553fa0 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
> @@ -3331,7 +3331,7 @@ brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, 
u32 event,
>  
>  	total_len = sizeof(struct brcmf_cfg80211_event_q);
>  	if (data)
> -		data_len += be32_to_cpu(msg->datalen);
> +		data_len = be32_to_cpu(msg->datalen);

This should be folded in patch 2/10 since this is where the bug gets 
introduced.
--
Florian
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 6383052..4553fa0 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3331,7 +3331,7 @@  brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, u32 event,
 
 	total_len = sizeof(struct brcmf_cfg80211_event_q);
 	if (data)
-		data_len += be32_to_cpu(msg->datalen);
+		data_len = be32_to_cpu(msg->datalen);
 	else
 		data_len = 0;
 	total_len += data_len;