From: Dan Williams <dcbw@redhat.com>
Date: Sat, 26 May 2007 03:23:43 +0000 (-0400)
Subject: [PATCH] libertas: sparse fixes
X-Git-Tag: v2.6.22-rc5~44^2~2^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=123e0e044091ca35a4766b38ae15032f2d41bcd6;p=linux-2.6

[PATCH] libertas: sparse fixes

Fix various issues reported by sparse.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/ioctl.c b/drivers/net/wireless/libertas/ioctl.c
index a59d26ba6c..4b145e3e7d 100644
--- a/drivers/net/wireless/libertas/ioctl.c
+++ b/drivers/net/wireless/libertas/ioctl.c
@@ -297,6 +297,7 @@ static int wlan_bt_set_invert_ioctl(wlan_private * priv, struct ifreq *req)
  */
 static int wlan_bt_get_invert_ioctl(wlan_private * priv, struct ifreq *req)
 {
+	struct iwreq *wrq = (struct iwreq *)req;
 	int ret;
 	union {
 		int id;
@@ -311,7 +312,7 @@ static int wlan_bt_get_invert_ioctl(wlan_private * priv, struct ifreq *req)
 				    (char *)&param);
 
 	if (ret == 0)
-		req->ifr_data = (char *)(le32_to_cpu(param.id));
+		wrq->u.param.value = le32_to_cpu(param.id);
 	else
 		return -EFAULT;
 
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 3da1efdf1a..a1ab698088 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -59,8 +59,8 @@
 //! Scan time specified in the channel TLV for each channel for active scans
 #define MRVDRV_ACTIVE_SCAN_CHAN_TIME   100
 
-const u8 zeromac[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-const u8 bcastmac[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+static const u8 zeromac[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+static const u8 bcastmac[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
 static inline void clear_bss_descriptor (struct bss_descriptor * bss)
 {
@@ -1855,7 +1855,6 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
 	for (idx = 0; idx < pscan->nr_sets && bytesleft; idx++) {
 		struct bss_descriptor new;
 		struct bss_descriptor * found = NULL;
-		struct bss_descriptor * iter_bss = NULL;
 		struct bss_descriptor * oldest = NULL;
 
 		/* Process the data fields and IEs returned for this BSS */