summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/fw.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/fw.c')
-rw-r--r--drivers/net/wireless/libertas/fw.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c
index d214692eb209..6c259878da96 100644
--- a/drivers/net/wireless/libertas/fw.c
+++ b/drivers/net/wireless/libertas/fw.c
@@ -214,7 +214,10 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->txantenna = RF_ANTENNA_2;
adapter->rxantenna = RF_ANTENNA_AUTO;
- adapter->is_datarate_auto = 1;
+ adapter->auto_rate = 1;
+ adapter->cur_rate = 0;
+ adapter->adhoc_grate_enabled = 0;
+
adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;
// set default capabilities
@@ -229,10 +232,6 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->needtowakeup = 0;
adapter->locallisteninterval = 0; /* default value in firmware will be used */
- adapter->datarate = 0; // Initially indicate the rate as auto
-
- adapter->adhoc_grate_enabled = 0;
-
adapter->intcounter = 0;
adapter->currenttxskb = NULL;