Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4f2fdaaf0e4209bff3b18dc14c915b61f5fa5cd2
Commit:     4f2fdaaf0e4209bff3b18dc14c915b61f5fa5cd2
Parent:     d65ead886a193682f88b07aaf11d46127735a2b5
Author:     Holger Schurig <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 13:12:27 2007 -0400
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:50:08 2007 -0700

    [PATCH] libertas: remove adapter->scantype
    
    scantype was initialized with CMD_SCAN_TYPE_ACTIVE, but there is no code
    that would ever change it, so we can use that variable directly.
    
    Signed-off-by: Holger Schurig <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/dev.h  |    2 --
 drivers/net/wireless/libertas/main.c |    3 ---
 drivers/net/wireless/libertas/scan.c |    2 +-
 3 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/libertas/dev.h 
b/drivers/net/wireless/libertas/dev.h
index a33c523..f6b1402 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -262,8 +262,6 @@ struct _wlan_adapter {
        struct list_head network_free_list;
        struct bss_descriptor *networks;
 
-       u8 scantype;
-
        u8 adhoccreate;
 
        /** capability Info used in Association, start, join */
diff --git a/drivers/net/wireless/libertas/main.c 
b/drivers/net/wireless/libertas/main.c
index 7845cc3..9ccc952 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1001,9 +1001,6 @@ static void wlan_init_adapter(wlan_private * priv)
        adapter->connect_status = LIBERTAS_DISCONNECTED;
        memset(adapter->current_addr, 0xff, ETH_ALEN);
 
-       /* scan type */
-       adapter->scantype = CMD_SCAN_TYPE_ACTIVE;
-
        /* 802.11 specific */
        adapter->secinfo.wep_enabled = 0;
        for (i = 0; i < sizeof(adapter->wep_keys) / 
sizeof(adapter->wep_keys[0]);
diff --git a/drivers/net/wireless/libertas/scan.c 
b/drivers/net/wireless/libertas/scan.c
index 33ee459..4f621a6 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -252,7 +252,7 @@ static void wlan_scan_create_channel_list(wlan_private * 
priv,
         *   be changed to passive on a per channel basis if restricted by
         *   regulatory requirements (11d or 11h)
         */
-       scantype = adapter->scantype;
+       scantype = CMD_SCAN_TYPE_ACTIVE;
 
        for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); 
rgnidx++) {
                if (priv->adapter->enable11d &&
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to