Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9780279c authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

wl1251: initialise default channel to zero 



Because wl->channel was initialised to one, the first join command in
wl1251_op_config() always failed.

Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Reviewed-by: default avatarVidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7a33732f

drivers/net/wireless/wl12xx/wl1251.h

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ void wl1251_disable_interrupts(struct wl1251 *wl); 
#define WL1251_DEFAULT_BEACON_INT 100

#define WL1251_DEFAULT_DTIM_PERIOD 1



#define WL1251_DEFAULT_CHANNEL 0



#define CHIP_ID_1251_PG10	           (0x7010101)

#define CHIP_ID_1251_PG11	           (0x7020101)

#define CHIP_ID_1251_PG12	           (0x7030101)

drivers/net/wireless/wl12xx/wl1251_main.c

+1 −1
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw) 
	wl->psm = 0;

	wl->tx_queue_stopped = false;

	wl->power_level = WL1251_DEFAULT_POWER_LEVEL;

	wl->channel = WL1251_DEFAULT_CHANNEL;



	wl1251_debugfs_reset(wl);
@@ -1302,7 +1303,6 @@ int wl1251_init_ieee80211(struct wl1251 *wl) 
}

EXPORT_SYMBOL_GPL(wl1251_init_ieee80211);



#define WL1251_DEFAULT_CHANNEL 1

struct ieee80211_hw *wl1251_alloc_hw(void)

{

	struct ieee80211_hw *hw;