aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-08-02 11:16:07 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:41 -0400
commit492b6da7d220b37275efb03710d57215304149fa (patch)
tree4e4475476c239c97b273b36fb0e2af60c3b80dce
parent9e22cb67d9a8acde7a5af6ed8cd5e74ebd6551b3 (diff)
[PATCH] libertas: fix mixed-case abuse in cmd_ds_802_11_scan
Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/hostcmd.h2
-rw-r--r--drivers/net/wireless/libertas/scan.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index 05ea54df71bd..e4fafbfa358d 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -159,7 +159,7 @@ struct cmd_ds_802_11_subscribe_event {
159 */ 159 */
160struct cmd_ds_802_11_scan { 160struct cmd_ds_802_11_scan {
161 u8 bsstype; 161 u8 bsstype;
162 u8 BSSID[ETH_ALEN]; 162 u8 bssid[ETH_ALEN];
163 u8 tlvbuffer[1]; 163 u8 tlvbuffer[1];
164#if 0 164#if 0
165 mrvlietypes_ssidparamset_t ssidParamSet; 165 mrvlietypes_ssidparamset_t ssidParamSet;
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index a98feedf001c..2937f79c4a01 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -1677,15 +1677,14 @@ int libertas_cmd_80211_scan(wlan_private * priv,
1677 1677
1678 /* Set fixed field variables in scan command */ 1678 /* Set fixed field variables in scan command */
1679 pscan->bsstype = pscancfg->bsstype; 1679 pscan->bsstype = pscancfg->bsstype;
1680 memcpy(pscan->BSSID, pscancfg->bssid, sizeof(pscan->BSSID)); 1680 memcpy(pscan->bssid, pscancfg->bssid, ETH_ALEN);
1681 memcpy(pscan->tlvbuffer, pscancfg->tlvbuffer, pscancfg->tlvbufferlen); 1681 memcpy(pscan->tlvbuffer, pscancfg->tlvbuffer, pscancfg->tlvbufferlen);
1682 1682
1683 cmd->command = cpu_to_le16(cmd_802_11_scan); 1683 cmd->command = cpu_to_le16(cmd_802_11_scan);
1684 1684
1685 /* size is equal to the sizeof(fixed portions) + the TLV len + header */ 1685 /* size is equal to the sizeof(fixed portions) + the TLV len + header */
1686 cmd->size = cpu_to_le16(sizeof(pscan->bsstype) 1686 cmd->size = cpu_to_le16(sizeof(pscan->bsstype) + ETH_ALEN
1687 + sizeof(pscan->BSSID) 1687 + pscancfg->tlvbufferlen + S_DS_GEN);
1688 + pscancfg->tlvbufferlen + S_DS_GEN);
1689 1688
1690 lbs_deb_scan("SCAN_CMD: command=%x, size=%x, seqnum=%x\n", 1689 lbs_deb_scan("SCAN_CMD: command=%x, size=%x, seqnum=%x\n",
1691 le16_to_cpu(cmd->command), le16_to_cpu(cmd->size), 1690 le16_to_cpu(cmd->command), le16_to_cpu(cmd->size),