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

Commit e441a5ea 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 5f0dd296 f1a46384

drivers/net/wireless/wl12xx/acx.c

+6 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power) 
	struct acx_current_tx_power *acx;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx dot11_cur_tx_pwr");

	wl1271_debug(DEBUG_ACX, "acx dot11_cur_tx_pwr %d", power);



	if (power < 0 || power > 25)

		return -EINVAL;
@@ -1624,22 +1624,22 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_acx_max_tx_retry(struct wl1271 *wl)

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)

{

	struct wl1271_acx_max_tx_retry *acx = NULL;

	struct wl1271_acx_ap_max_tx_retry *acx = NULL;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx max tx retry");

	wl1271_debug(DEBUG_ACX, "acx ap max tx retry");



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

	if (!acx)

		return -ENOMEM;



	acx->max_tx_retry = cpu_to_le16(wl->conf.tx.ap_max_tx_retries);

	acx->max_tx_retry = cpu_to_le16(wl->conf.tx.max_tx_retries);



	ret = wl1271_cmd_configure(wl, ACX_MAX_TX_FAILURE, acx, sizeof(*acx));

	if (ret < 0) {

		wl1271_warning("acx max tx retry failed: %d", ret);

		wl1271_warning("acx ap max tx retry failed: %d", ret);

		goto out;

	}

drivers/net/wireless/wl12xx/acx.h

+2 −2
Original line number Diff line number Diff line
@@ -1168,7 +1168,7 @@ struct wl1271_acx_ps_rx_streaming { 
	u8 timeout;

} __packed;



struct wl1271_acx_max_tx_retry {

struct wl1271_acx_ap_max_tx_retry {

	struct acx_header header;



	/*
@@ -1400,7 +1400,7 @@ int wl1271_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, u16 ssn, 
				       bool enable);

int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime);

int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable);

int wl1271_acx_max_tx_retry(struct wl1271 *wl);

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl);

int wl1271_acx_config_ps(struct wl1271 *wl);

int wl1271_acx_set_inconnection_sta(struct wl1271 *wl, u8 *addr);

int wl1271_acx_set_ap_beacon_filter(struct wl1271 *wl, bool enable);

drivers/net/wireless/wl12xx/boot.c

+3 −1
Original line number Diff line number Diff line
@@ -513,7 +513,9 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) 
		PERIODIC_SCAN_COMPLETE_EVENT_ID;



	if (wl->bss_type == BSS_TYPE_AP_BSS)

		wl->event_mask |= STA_REMOVE_COMPLETE_EVENT_ID;

		wl->event_mask |= STA_REMOVE_COMPLETE_EVENT_ID |

				  INACTIVE_STA_EVENT_ID |

				  MAX_TX_RETRY_EVENT_ID;

	else

		wl->event_mask |= DUMMY_PACKET_EVENT_ID |

			BA_SESSION_RX_CONSTRAINT_EVENT_ID;

drivers/net/wireless/wl12xx/cmd.c

+1 −5
Original line number Diff line number Diff line
@@ -400,10 +400,6 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type) 


	join->ctrl |= wl->session_counter << WL1271_JOIN_CMD_TX_SESSION_OFFSET;



	/* reset TX security counters */

	wl->tx_security_last_seq = 0;

	wl->tx_security_seq = 0;



	wl1271_debug(DEBUG_CMD, "cmd join: basic_rate_set=0x%x, rate_set=0x%x",

		join->basic_rate_set, join->supported_rate_set);
@@ -1084,7 +1080,7 @@ int wl1271_cmd_start_bss(struct wl1271 *wl) 


	memcpy(cmd->bssid, bss_conf->bssid, ETH_ALEN);



	cmd->aging_period = cpu_to_le16(WL1271_AP_DEF_INACTIV_SEC);

	cmd->aging_period = cpu_to_le16(wl->conf.tx.ap_aging_period);

	cmd->bss_index = WL1271_AP_BSS_INDEX;

	cmd->global_hlid = WL1271_AP_GLOBAL_HLID;

	cmd->broadcast_hlid = WL1271_AP_BROADCAST_HLID;

drivers/net/wireless/wl12xx/conf.h

+9 −1
Original line number Diff line number Diff line
@@ -713,8 +713,16 @@ struct conf_tx_settings { 
	/*

	 * AP-mode - allow this number of TX retries to a station before an

	 * event is triggered from FW.

	 * In AP-mode the hlids of unreachable stations are given in the

	 * "sta_tx_retry_exceeded" member in the event mailbox.

	 */

	u16 ap_max_tx_retries;

	u8 max_tx_retries;



	/*

	 * AP-mode - after this number of seconds a connected station is

	 * considered inactive.

	 */

	u16 ap_aging_period;



	/*

	 * Configuration for TID parameters.