Skip to content

Commit

Permalink
[PATCH] libertas: remove adapter->scantype
Browse files Browse the repository at this point in the history
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 <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Holger Schurig authored and David S. Miller committed Oct 10, 2007
1 parent d65ead8 commit 4f2fdaa
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
2 changes: 0 additions & 2 deletions drivers/net/wireless/libertas/dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/libertas/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 4f2fdaa

Please sign in to comment.