aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251.h2
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251.h b/drivers/net/wireless/wl12xx/wl1251.h
index 86d2abea4e1e..998e4b6252bd 100644
--- a/drivers/net/wireless/wl12xx/wl1251.h
+++ b/drivers/net/wireless/wl12xx/wl1251.h
@@ -398,6 +398,8 @@ void wl1251_disable_interrupts(struct wl1251 *wl);
398#define WL1251_DEFAULT_BEACON_INT 100 398#define WL1251_DEFAULT_BEACON_INT 100
399#define WL1251_DEFAULT_DTIM_PERIOD 1 399#define WL1251_DEFAULT_DTIM_PERIOD 1
400 400
401#define WL1251_DEFAULT_CHANNEL 0
402
401#define CHIP_ID_1251_PG10 (0x7010101) 403#define CHIP_ID_1251_PG10 (0x7010101)
402#define CHIP_ID_1251_PG11 (0x7020101) 404#define CHIP_ID_1251_PG11 (0x7020101)
403#define CHIP_ID_1251_PG12 (0x7030101) 405#define CHIP_ID_1251_PG12 (0x7030101)
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index d03169266b29..2514c94294d7 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -461,6 +461,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
461 wl->psm = 0; 461 wl->psm = 0;
462 wl->tx_queue_stopped = false; 462 wl->tx_queue_stopped = false;
463 wl->power_level = WL1251_DEFAULT_POWER_LEVEL; 463 wl->power_level = WL1251_DEFAULT_POWER_LEVEL;
464 wl->channel = WL1251_DEFAULT_CHANNEL;
464 465
465 wl1251_debugfs_reset(wl); 466 wl1251_debugfs_reset(wl);
466 467
@@ -1302,7 +1303,6 @@ out:
1302} 1303}
1303EXPORT_SYMBOL_GPL(wl1251_init_ieee80211); 1304EXPORT_SYMBOL_GPL(wl1251_init_ieee80211);
1304 1305
1305#define WL1251_DEFAULT_CHANNEL 1
1306struct ieee80211_hw *wl1251_alloc_hw(void) 1306struct ieee80211_hw *wl1251_alloc_hw(void)
1307{ 1307{
1308 struct ieee80211_hw *hw; 1308 struct ieee80211_hw *hw;