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

Commit 46bf6958 authored by John W. Linville's avatar John W. Linville
Browse files

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

parents e7480bbb 4b48e687

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6321,7 +6321,7 @@ WL1271 WIRELESS DRIVER 
M:	Luciano Coelho <luciano.coelho@nokia.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

F:	drivers/net/wireless/wl12xx/wl1271*

F:	include/linux/wl12xx.h

arch/arm/mach-omap2/board-zoom-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 
	{

		.name		= "wl1271",

		.mmc		= 3,

		.wires		= 4,

		.caps		= MMC_CAP_4_BIT_DATA,

		.gpio_wp	= -EINVAL,

		.gpio_cd	= -EINVAL,

		.nonremovable	= true,

drivers/net/wireless/wl12xx/wl1271.h

+15 −14
Original line number Diff line number Diff line
@@ -117,10 +117,7 @@ enum { 
#define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff))

#define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff))



/*

 * Enable/disable 802.11a support for WL1273

 */

#undef WL1271_80211A_ENABLED

#define WL1271_CIPHER_SUITE_GEM 0x00147201



#define WL1271_BUSY_WORD_CNT 1

#define WL1271_BUSY_WORD_LEN (WL1271_BUSY_WORD_CNT * sizeof(u32))
@@ -133,6 +130,8 @@ enum { 


#define ACX_TX_DESCRIPTORS         32



#define WL1271_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)



enum wl1271_state {

	WL1271_STATE_OFF,

	WL1271_STATE_ON,
@@ -301,6 +300,7 @@ struct wl1271_rx_mem_pool_addr { 
struct wl1271_scan {

	struct cfg80211_scan_request *req;

	bool *scanned_ch;

	bool failed;

	u8 state;

	u8 ssid[IW_ESSID_MAX_SIZE+1];

	size_t ssid_len;
@@ -350,6 +350,7 @@ struct wl1271 { 
#define WL1271_FLAG_IDLE              (10)

#define WL1271_FLAG_IDLE_REQUESTED    (11)

#define WL1271_FLAG_PSPOLL_FAILURE    (12)

#define WL1271_FLAG_STA_STATE_SENT    (13)

	unsigned long flags;



	struct wl1271_partition_set part;
@@ -362,6 +363,7 @@ struct wl1271 { 
	u8 *fw;

	size_t fw_len;

	struct wl1271_nvs_file *nvs;

	size_t nvs_len;



	s8 hw_pg_ver;
@@ -408,9 +410,15 @@ struct wl1271 { 
	/* Rx memory pool address */

	struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;



	/* Intermediate buffer, used for packet aggregation */

	u8 *aggr_buf;



	/* The target interrupt mask */

	struct work_struct irq_work;



	/* Hardware recovery work */

	struct work_struct recovery_work;



	/* The mbox event mask */

	u32 event_mask;
@@ -419,6 +427,7 @@ struct wl1271 { 


	/* Are we currently scanning */

	struct wl1271_scan scan;

	struct delayed_work scan_complete_work;



	/* Our association ID */

	u16 aid;
@@ -475,6 +484,8 @@ struct wl1271 { 


	bool sg_enabled;



	bool enable_11a;



	struct list_head list;



	/* Most recently reported noise in dBm */
@@ -498,14 +509,4 @@ int wl1271_plt_stop(struct wl1271 *wl); 
#define WL1271_PRE_POWER_ON_SLEEP 20 /* in miliseconds */

#define WL1271_POWER_ON_SLEEP 200 /* in miliseconds */



static inline bool wl1271_11a_enabled(void)

{

	/* FIXME: this could be determined based on the NVS-INI file */

#ifdef WL1271_80211A_ENABLED

	return true;

#else

	return false;

#endif

}



#endif

drivers/net/wireless/wl12xx/wl1271_acx.c

+0 −34
Original line number Diff line number Diff line
@@ -86,40 +86,6 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth) 
	return ret;

}



int wl1271_acx_fw_version(struct wl1271 *wl, char *buf, size_t len)

{

	struct acx_revision *rev;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx fw rev");



	rev = kzalloc(sizeof(*rev), GFP_KERNEL);

	if (!rev) {

		ret = -ENOMEM;

		goto out;

	}



	ret = wl1271_cmd_interrogate(wl, ACX_FW_REV, rev, sizeof(*rev));

	if (ret < 0) {

		wl1271_warning("ACX_FW_REV interrogate failed");

		goto out;

	}



	/* be careful with the buffer sizes */

	strncpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version)));



	/*

	 * if the firmware version string is exactly

	 * sizeof(rev->fw_version) long or fw_len is less than

	 * sizeof(rev->fw_version) it won't be null terminated

	 */

	buf[min(len, sizeof(rev->fw_version)) - 1] = '\0';



out:

	kfree(rev);

	return ret;

}



int wl1271_acx_tx_power(struct wl1271 *wl, int power)

{

	struct acx_current_tx_power *acx;

drivers/net/wireless/wl12xx/wl1271_acx.h

+0 −31
Original line number Diff line number Diff line
@@ -100,35 +100,6 @@ struct acx_error_counter { 
	__le32 seq_num_miss;

} __packed;



struct acx_revision {

	struct acx_header header;



	/*

	 * The WiLink firmware version, an ASCII string x.x.x.x,

	 * that uniquely identifies the current firmware.

	 * The left most digit is incremented each time a

	 * significant change is made to the firmware, such as

	 * code redesign or new platform support.

	 * The second digit is incremented when major enhancements

	 * are added or major fixes are made.

	 * The third digit is incremented for each GA release.

	 * The fourth digit is incremented for each build.

	 * The first two digits identify a firmware release version,

	 * in other words, a unique set of features.

	 * The first three digits identify a GA release.

	 */

	char fw_version[20];



	/*

	 * This 4 byte field specifies the WiLink hardware version.

	 * bits 0  - 15: Reserved.

	 * bits 16 - 23: Version ID - The WiLink version ID

	 *              (1 = first spin, 2 = second spin, and so on).

	 * bits 24 - 31: Chip ID - The WiLink chip ID.

	 */

	__le32 hw_version;

} __packed;



enum wl1271_psm_mode {

	/* Active mode */

	WL1271_PSM_CAM = 0,
@@ -1060,7 +1031,6 @@ enum { 
	ACX_PEER_HT_CAP             = 0x0057,

	ACX_HT_BSS_OPERATION        = 0x0058,

	ACX_COEX_ACTIVITY           = 0x0059,

	ACX_SET_SMART_REFLEX_DEBUG  = 0x005A,

	ACX_SET_DCO_ITRIM_PARAMS    = 0x0061,

	DOT11_RX_MSDU_LIFE_TIME     = 0x1004,

	DOT11_CUR_TX_PWR            = 0x100D,
@@ -1077,7 +1047,6 @@ enum { 


int wl1271_acx_wake_up_conditions(struct wl1271 *wl);

int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth);

int wl1271_acx_fw_version(struct wl1271 *wl, char *buf, size_t len);

int wl1271_acx_tx_power(struct wl1271 *wl, int power);

int wl1271_acx_feature_cfg(struct wl1271 *wl);

int wl1271_acx_mem_map(struct wl1271 *wl,