OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mwifiex: fix bug in mwifiex_save_curr_bcn() 

Since timestamp in beacon buffer keeps changing all the time,
the memcmp check in mwifiex_save_curr_bcn() is redundant.
Remove that memcmp check and also avoid freeing and allocation
of buffer if required beacon buffer size is same as previous one.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar 2011-04-27 19:13:13 -07:00 committed by John W. Linville
parent a46b7b5c13
commit 030fe7974f
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/wireless/mwifiex/scan.c
View File

@ -2990,32 +2990,28 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
struct mwifiex_bssdescriptor *curr_bss =
&priv->curr_bss_params.bss_descriptor;
/* save the beacon buffer if it is not saved or updated */
if ((priv->curr_bcn_buf == NULL) ||
(priv->curr_bcn_size != curr_bss->beacon_buf_size) ||
(memcmp(priv->curr_bcn_buf, curr_bss->beacon_buf,
curr_bss->beacon_buf_size))) {
if (!curr_bss->beacon_buf_size)
return;
/* allocate beacon buffer at 1st time; or if it's size has changed */
if (!priv->curr_bcn_buf ||
priv->curr_bcn_size != curr_bss->beacon_buf_size) {
priv->curr_bcn_size = curr_bss->beacon_buf_size;
kfree(priv->curr_bcn_buf);
priv->curr_bcn_buf = NULL;
priv->curr_bcn_size = curr_bss->beacon_buf_size;
if (!priv->curr_bcn_size)
return;
priv->curr_bcn_buf = kzalloc(curr_bss->beacon_buf_size,
GFP_KERNEL);
if (!priv->curr_bcn_buf) {
dev_err(priv->adapter->dev,
"failed to alloc curr_bcn_buf\n");
} else {
memcpy(priv->curr_bcn_buf, curr_bss->beacon_buf,
curr_bss->beacon_buf_size);
dev_dbg(priv->adapter->dev,
"info: current beacon saved %d\n",
priv->curr_bcn_size);
return;
}
}
memcpy(priv->curr_bcn_buf, curr_bss->beacon_buf,
curr_bss->beacon_buf_size);
dev_dbg(priv->adapter->dev, "info: current beacon saved %d\n",
priv->curr_bcn_size);
}
/*