Commit 2cfc7ba5 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Greg Kroah-Hartman

Staging: wlan-ng: Drop wrapper function

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: default avatarBhumika Goyal <bhumirks@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c42bc25
...@@ -388,7 +388,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib, ...@@ -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, ...@@ -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, ...@@ -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
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment