iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: wlan-ng: Drop wrapper function

Browse Source 
Drop the function prism2mgmt_pstr2bytearea and replace its function call
with the standard function memcpy that it wrapped.
The code becomes cleaner after this patch.

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bhumika Goyal 2016-02-13 18:49:34 +05:30 committed by Greg Kroah-Hartman
parent 0c42bc25ed
commit 2cfc7ba561
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/wlan-ng/prism2mib.c
View File

@ -388,7 +388,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib,
prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2); prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2);
} else { } else {
memset(bytebuf, 0, mib->parm2); memset(bytebuf, 0, mib->parm2);
prism2mgmt_pstr2bytearea(bytebuf, pstr); memcpy(bytebuf, pstr->data, pstr->len);
result = result =
hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2); hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2);
} }
@ -543,7 +543,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib,
len = (pstr->len > 5) ? HFA384x_RID_CNFWEP128DEFAULTKEY_LEN : len = (pstr->len > 5) ? HFA384x_RID_CNFWEP128DEFAULTKEY_LEN :
HFA384x_RID_CNFWEPDEFAULTKEY_LEN; HFA384x_RID_CNFWEPDEFAULTKEY_LEN;
memset(bytebuf, 0, len); memset(bytebuf, 0, len);
prism2mgmt_pstr2bytearea(bytebuf, pstr); memcpy(bytebuf, pstr->data, pstr->len);
result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len); result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len);
} }
@ -758,26 +758,6 @@ void prism2mgmt_pstr2bytestr(struct hfa384x_bytestr *bytestr,
memcpy(bytestr->data, pstr->data, pstr->len); memcpy(bytestr->data, pstr->data, pstr->len);
} }
/*----------------------------------------------------------------
* prism2mgmt_pstr2bytearea
*
* Convert the pstr data in the WLAN message structure into an hfa384x
* byte area format.
*
* Arguments:
* bytearea hfa384x byte area data type
* pstr wlan message data
*
* Returns:
* Nothing
*
----------------------------------------------------------------*/
void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
{
memcpy(bytearea, pstr->data, pstr->len);
}
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_bytestr2pstr * prism2mgmt_bytestr2pstr
* *