Commit 492b6da7 authored by Dan Williams's avatar Dan Williams Committed by David S. Miller

[PATCH] libertas: fix mixed-case abuse in cmd_ds_802_11_scan

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e22cb67
...@@ -159,7 +159,7 @@ struct cmd_ds_802_11_subscribe_event { ...@@ -159,7 +159,7 @@ struct cmd_ds_802_11_subscribe_event {
*/ */
struct cmd_ds_802_11_scan { struct cmd_ds_802_11_scan {
u8 bsstype; u8 bsstype;
u8 BSSID[ETH_ALEN]; u8 bssid[ETH_ALEN];
u8 tlvbuffer[1]; u8 tlvbuffer[1];
#if 0 #if 0
mrvlietypes_ssidparamset_t ssidParamSet; mrvlietypes_ssidparamset_t ssidParamSet;
......
...@@ -1677,14 +1677,13 @@ int libertas_cmd_80211_scan(wlan_private * priv, ...@@ -1677,14 +1677,13 @@ int libertas_cmd_80211_scan(wlan_private * priv,
/* Set fixed field variables in scan command */ /* Set fixed field variables in scan command */
pscan->bsstype = pscancfg->bsstype; pscan->bsstype = pscancfg->bsstype;
memcpy(pscan->BSSID, pscancfg->bssid, sizeof(pscan->BSSID)); memcpy(pscan->bssid, pscancfg->bssid, ETH_ALEN);
memcpy(pscan->tlvbuffer, pscancfg->tlvbuffer, pscancfg->tlvbufferlen); memcpy(pscan->tlvbuffer, pscancfg->tlvbuffer, pscancfg->tlvbufferlen);
cmd->command = cpu_to_le16(cmd_802_11_scan); cmd->command = cpu_to_le16(cmd_802_11_scan);
/* size is equal to the sizeof(fixed portions) + the TLV len + header */ /* size is equal to the sizeof(fixed portions) + the TLV len + header */
cmd->size = cpu_to_le16(sizeof(pscan->bsstype) cmd->size = cpu_to_le16(sizeof(pscan->bsstype) + ETH_ALEN
+ sizeof(pscan->BSSID)
+ pscancfg->tlvbufferlen + S_DS_GEN); + pscancfg->tlvbufferlen + S_DS_GEN);
lbs_deb_scan("SCAN_CMD: command=%x, size=%x, seqnum=%x\n", lbs_deb_scan("SCAN_CMD: command=%x, size=%x, seqnum=%x\n",
......
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