Browse Source

[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>
Dan Williams 18 years ago
parent
commit
492b6da7d2
2 changed files with 4 additions and 5 deletions
  1. 1 1
      drivers/net/wireless/libertas/hostcmd.h
  2. 3 4
      drivers/net/wireless/libertas/scan.c

+ 1 - 1
drivers/net/wireless/libertas/hostcmd.h

@@ -159,7 +159,7 @@ struct cmd_ds_802_11_subscribe_event {
  */
 struct cmd_ds_802_11_scan {
 	u8 bsstype;
-	u8 BSSID[ETH_ALEN];
+	u8 bssid[ETH_ALEN];
 	u8 tlvbuffer[1];
 #if 0
 	mrvlietypes_ssidparamset_t ssidParamSet;

+ 3 - 4
drivers/net/wireless/libertas/scan.c

@@ -1677,15 +1677,14 @@ int libertas_cmd_80211_scan(wlan_private * priv,
 
 	/* Set fixed field variables in scan command */
 	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);
 
 	cmd->command = cpu_to_le16(cmd_802_11_scan);
 
 	/* size is equal to the sizeof(fixed portions) + the TLV len + header */
-	cmd->size = cpu_to_le16(sizeof(pscan->bsstype)
-				     + sizeof(pscan->BSSID)
-				     + pscancfg->tlvbufferlen + S_DS_GEN);
+	cmd->size = cpu_to_le16(sizeof(pscan->bsstype) + ETH_ALEN
+				+ pscancfg->tlvbufferlen + S_DS_GEN);
 
 	lbs_deb_scan("SCAN_CMD: command=%x, size=%x, seqnum=%x\n",
 		     le16_to_cpu(cmd->command), le16_to_cpu(cmd->size),