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

Commit 95f84f29 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

parents a1775846 95a77610

drivers/net/wireless/wl12xx/acx.c

+2 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, 
	acx->ht_protection =

		(u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION);

	acx->rifs_mode = 0;

	acx->gf_protection = 0;

	acx->gf_protection =

		!!(ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);

	acx->ht_tx_burst_limit = 0;

	acx->dual_cts_protection = 0;

drivers/net/wireless/wl12xx/boot.c

+3 −0
Original line number Diff line number Diff line
@@ -488,6 +488,9 @@ static void wl1271_boot_hw_version(struct wl1271 *wl) 
	fuse = (fuse & PG_VER_MASK) >> PG_VER_OFFSET;



	wl->hw_pg_ver = (s8)fuse;



	if (((wl->hw_pg_ver & PG_MAJOR_VER_MASK) >> PG_MAJOR_VER_OFFSET) < 3)

		wl->quirks |= WL12XX_QUIRK_END_OF_TRANSACTION;

}



/* uploads NVS and firmware */

drivers/net/wireless/wl12xx/boot.h

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ struct wl1271_static_data { 
#define PG_VER_MASK          0x3c

#define PG_VER_OFFSET        2



#define PG_MAJOR_VER_MASK    0x3

#define PG_MAJOR_VER_OFFSET  0x0

#define PG_MINOR_VER_MASK    0xc

#define PG_MINOR_VER_OFFSET  0x2



#define CMD_MBOX_ADDRESS     0x407B4



#define POLARITY_LOW         BIT(1)

drivers/net/wireless/wl12xx/cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len, 
	cmd->status = 0;



	WARN_ON(len % 4 != 0);

	WARN_ON(test_bit(WL1271_FLAG_IN_ELP, &wl->flags));



	wl1271_write(wl, wl->cmd_box_addr, buf, len, false);

drivers/net/wireless/wl12xx/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void wl1271_debugfs_update_stats(struct wl1271 *wl) 


	mutex_lock(&wl->mutex);



	ret = wl1271_ps_elp_wakeup(wl, false);

	ret = wl1271_ps_elp_wakeup(wl);

	if (ret < 0)

		goto out;