From e1bcdffba39dd40c83468f2e98e86d0f4656c1a8 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 25 May 2007 23:23:43 -0400
Subject: [PATCH] --- yaml --- r: 57677 b: refs/heads/master c:
 123e0e044091ca35a4766b38ae15032f2d41bcd6 h: refs/heads/master i:   57675:
 b25cd777e9b21c6a319d5d9fd79d5374681bc663 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/libertas/ioctl.c | 3 ++-
 trunk/drivers/net/wireless/libertas/scan.c  | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c177f48e85a7..4d5527884980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e8a5bd9502f709ddd1ea441ef0362fad3e4a4a1
+refs/heads/master: 123e0e044091ca35a4766b38ae15032f2d41bcd6
diff --git a/trunk/drivers/net/wireless/libertas/ioctl.c b/trunk/drivers/net/wireless/libertas/ioctl.c
index a59d26ba6c70..4b145e3e7db1 100644
--- a/trunk/drivers/net/wireless/libertas/ioctl.c
+++ b/trunk/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/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c
index 3da1efdf1a0c..a1ab698088db 100644
--- a/trunk/drivers/net/wireless/libertas/scan.c
+++ b/trunk/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 */