[PATCH 1/2] mwifiex: change debug dump issue since skb maybe null

[PATCH 1/2] mwifiex: change debug dump issue since skb maybe null

[Avinash Patil]

From: Zhaoyang Liu <liuzy@marvell.com>

This patch fixes semantic warning for debugging data dump feature.
Previous code is based on the assumption that skb is not null.
New change makes sure that we already have data buffer.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Zhaoyang Liu <liuzy@marvell.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
---
 drivers/net/wireless/mwifiex/cmdevt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index a51feac..207da40 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -469,10 +469,11 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter)
 		memset(rx_info, 0, sizeof(*rx_info));
 		rx_info->bss_num = priv->bss_num;
 		rx_info->bss_type = priv->bss_type;
+		mwifiex_dbg_dump(adapter, EVT_D, "Event Buf:",
+				 skb->data, skb->len);
 	}
 
 	mwifiex_dbg(adapter, EVENT, "EVENT: cause: %#x\n", eventcause);
-	mwifiex_dbg_dump(adapter, EVT_D, "Event Buf:", skb->data, skb->len);
 
 	if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)
 		ret = mwifiex_process_uap_event(priv);
-- 
1.8.1.4

[PATCH 2/2] mwifiex: update current config_band info in start_ap

[Avinash Patil]

It was observed that AP beacons would not reflect correct regulatory
information upon starting AP in A band. This was because of missing
AP config band update in set_channel of start_ap.

Signed-off-by: Avinash Patil <patila@marvell.com>
---
 drivers/net/wireless/mwifiex/uap_cmd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index a62b43e..b749300 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -832,6 +832,8 @@ void mwifiex_uap_set_channel(struct mwifiex_private *priv,
 		if (chandef.width > NL80211_CHAN_WIDTH_40)
 			config_bands |= BAND_AAC;
 	}
+
+	priv->adapter->config_bands = config_bands;
 }
 
 int mwifiex_config_start_uap(struct mwifiex_private *priv,
-- 
1.8.1.4

Re: [1/2] mwifiex: change debug dump issue since skb maybe null

[Kalle Valo]

> From: Zhaoyang Liu <liuzy@marvell.com>
> 
> This patch fixes semantic warning for debugging data dump feature.
> Previous code is based on the assumption that skb is not null.
> New change makes sure that we already have data buffer.
> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Zhaoyang Liu <liuzy@marvell.com>
> Signed-off-by: Avinash Patil <patila@marvell.com>

Thanks, 2 patches applied to wireless-drivers-next.git:

7a56c4168e44 mwifiex: change debug dump issue since skb maybe null
39d94eaa76e7 mwifiex: update current config_band info in start_ap

Kalle Valo