Revert "wl12xx: support FW TX inactivity triggers" (25eaea30) · Commits · 戴 / test

drivers/net/wireless/wl12xx/acx.c

+5 −29

Original line number	Diff line number	Diff line
		@@ -1577,46 +1577,22 @@ out:
		return ret;
		}

		int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)
		int wl1271_acx_max_tx_retry(struct wl1271 *wl)
		{
		struct wl1271_acx_ap_max_tx_retry *acx = NULL;
		struct wl1271_acx_max_tx_retry *acx = NULL;
		int ret;

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

		acx = kzalloc(sizeof(*acx), GFP_KERNEL);
		if (!acx)
		return -ENOMEM;

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

		ret = wl1271_cmd_configure(wl, ACX_MAX_TX_FAILURE, acx, sizeof(*acx));
		if (ret < 0) {
		wl1271_warning("acx ap max tx retry failed: %d", ret);
		goto out;
		}

		out:
		kfree(acx);
		return ret;
		}

		int wl1271_acx_sta_max_tx_retry(struct wl1271 *wl)
		{
		struct wl1271_acx_sta_max_tx_retry *acx = NULL;
		int ret;

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

		acx = kzalloc(sizeof(*acx), GFP_KERNEL);
		if (!acx)
		return -ENOMEM;

		acx->max_tx_retry = wl->conf.tx.max_tx_retries;

		ret = wl1271_cmd_configure(wl, ACX_CONS_TX_FAILURE, acx, sizeof(*acx));
		if (ret < 0) {
		wl1271_warning("acx sta max tx retry failed: %d", ret);
		wl1271_warning("acx max tx retry failed: %d", ret);
		goto out;
		}

+2 −10

Original line number	Diff line number	Diff line
		@@ -1153,7 +1153,7 @@ struct wl1271_acx_fw_tsf_information {
		u8 padding[3];
		} __packed;

		struct wl1271_acx_ap_max_tx_retry {
		struct wl1271_acx_max_tx_retry {
		struct acx_header header;

		/*
		@@ -1164,13 +1164,6 @@ struct wl1271_acx_ap_max_tx_retry {
		u8 padding_1[2];
		} __packed;

		struct wl1271_acx_sta_max_tx_retry {
		struct acx_header header;

		u8 max_tx_retry;
		u8 padding_1[3];
		} __packed;

		struct wl1271_acx_config_ps {
		struct acx_header header;

		@@ -1391,8 +1384,7 @@ int wl1271_acx_set_ba_session(struct wl1271 *wl,
		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_ap_max_tx_retry(struct wl1271 *wl);
		int wl1271_acx_sta_max_tx_retry(struct wl1271 *wl);
		int wl1271_acx_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);

+2 −4

Original line number	Diff line number	Diff line
		@@ -478,12 +478,10 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl)
		DISCONNECT_EVENT_COMPLETE_ID \|
		RSSI_SNR_TRIGGER_0_EVENT_ID \|
		PSPOLL_DELIVERY_FAILURE_EVENT_ID \|
		SOFT_GEMINI_SENSE_EVENT_ID \|
		MAX_TX_RETRY_EVENT_ID;
		SOFT_GEMINI_SENSE_EVENT_ID;

		if (wl->bss_type == BSS_TYPE_AP_BSS)
		wl->event_mask \|= STA_REMOVE_COMPLETE_EVENT_ID \|
		INACTIVE_STA_EVENT_ID;
		wl->event_mask \|= STA_REMOVE_COMPLETE_EVENT_ID;
		else
		wl->event_mask \|= DUMMY_PACKET_EVENT_ID;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1080,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(wl->conf.tx.ap_aging_period);
		cmd->aging_period = cpu_to_le16(WL1271_AP_DEF_INACTIV_SEC);
		cmd->bss_index = WL1271_AP_BSS_INDEX;
		cmd->global_hlid = WL1271_AP_GLOBAL_HLID;
		cmd->broadcast_hlid = WL1271_AP_BROADCAST_HLID;

+2 −10

Original line number	Diff line number	Diff line
		@@ -711,18 +711,10 @@ struct conf_tx_settings {
		struct conf_tx_ac_category ac_conf[CONF_TX_MAX_AC_COUNT];

		/*
		* Allow this number of TX retries to a connected station/AP before an
		* 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.
		*/
		u8 max_tx_retries;

		/*
		* AP-mode - after this number of seconds a connected station is
		* considered inactive.
		*/
		u16 ap_aging_period;
		u16 ap_max_tx_retries;

		/*
		* Configuration for TID parameters.