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

Commit 0603d891 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: move role_id into wlvif 



move role_id into the per-interface data, rather than
being global.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 6840e37a

drivers/net/wireless/wl12xx/acx.c

+71 −53
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "reg.h"

#include "ps.h"



int wl1271_acx_wake_up_conditions(struct wl1271 *wl)

int wl1271_acx_wake_up_conditions(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct acx_wake_up_condition *wake_up;

	int ret;
@@ -46,7 +46,7 @@ int wl1271_acx_wake_up_conditions(struct wl1271 *wl) 
		goto out;

	}



	wake_up->role_id = wl->role_id;

	wake_up->role_id = wlvif->role_id;

	wake_up->wake_up_event = wl->conf.conn.wake_up_event;

	wake_up->listen_interval = wl->conf.conn.listen_interval;
@@ -84,7 +84,8 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth) 
	return ret;

}



int wl1271_acx_tx_power(struct wl1271 *wl, int power)

int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			int power)

{

	struct acx_current_tx_power *acx;

	int ret;
@@ -100,7 +101,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->current_tx_power = power * 10;



	ret = wl1271_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));
@@ -114,7 +115,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power) 
	return ret;

}



int wl1271_acx_feature_cfg(struct wl1271 *wl)

int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct acx_feature_config *feature;

	int ret;
@@ -128,7 +129,7 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl) 
	}



	/* DF_ENCRYPTION_DISABLE and DF_SNIFF_MODE_ENABLE are disabled */

	feature->role_id = wl->role_id;

	feature->role_id = wlvif->role_id;

	feature->data_flow_options = 0;

	feature->options = 0;
@@ -210,7 +211,8 @@ int wl1271_acx_pd_threshold(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time)

int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		    enum acx_slot_type slot_time)

{

	struct acx_slot *slot;

	int ret;
@@ -223,7 +225,7 @@ int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time) 
		goto out;

	}



	slot->role_id = wl->role_id;

	slot->role_id = wlvif->role_id;

	slot->wone_index = STATION_WONE_INDEX;

	slot->slot_time = slot_time;
@@ -238,8 +240,8 @@ int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time) 
	return ret;

}



int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,

				 void *mc_list, u32 mc_list_len)

int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 bool enable, void *mc_list, u32 mc_list_len)

{

	struct acx_dot11_grp_addr_tbl *acx;

	int ret;
@@ -253,7 +255,7 @@ int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable, 
	}



	/* MAC filtering */

	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->enabled = enable;

	acx->num_groups = mc_list_len;

	memcpy(acx->mac_table, mc_list, mc_list_len * ETH_ALEN);
@@ -270,7 +272,8 @@ int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable, 
	return ret;

}



int wl1271_acx_service_period_timeout(struct wl1271 *wl)

int wl1271_acx_service_period_timeout(struct wl1271 *wl,

				      struct wl12xx_vif *wlvif)

{

	struct acx_rx_timeout *rx_timeout;

	int ret;
@@ -283,7 +286,7 @@ int wl1271_acx_service_period_timeout(struct wl1271 *wl) 


	wl1271_debug(DEBUG_ACX, "acx service period timeout");



	rx_timeout->role_id = wl->role_id;

	rx_timeout->role_id = wlvif->role_id;

	rx_timeout->ps_poll_timeout = cpu_to_le16(wl->conf.rx.ps_poll_timeout);

	rx_timeout->upsd_timeout = cpu_to_le16(wl->conf.rx.upsd_timeout);
@@ -300,7 +303,8 @@ int wl1271_acx_service_period_timeout(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold)

int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			     u32 rts_threshold)

{

	struct acx_rts_threshold *rts;

	int ret;
@@ -320,7 +324,7 @@ int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold) 
		goto out;

	}



	rts->role_id = wl->role_id;

	rts->role_id = wlvif->role_id;

	rts->threshold = cpu_to_le16((u16)rts_threshold);



	ret = wl1271_cmd_configure(wl, DOT11_RTS_THRESHOLD, rts, sizeof(*rts));
@@ -363,7 +367,8 @@ int wl1271_acx_dco_itrim_params(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter)

int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 bool enable_filter)

{

	struct acx_beacon_filter_option *beacon_filter = NULL;

	int ret = 0;
@@ -380,7 +385,7 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter) 
		goto out;

	}



	beacon_filter->role_id = wl->role_id;

	beacon_filter->role_id = wlvif->role_id;

	beacon_filter->enable = enable_filter;



	/*
@@ -401,7 +406,8 @@ int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter) 
	return ret;

}



int wl1271_acx_beacon_filter_table(struct wl1271 *wl)

int wl1271_acx_beacon_filter_table(struct wl1271 *wl,

				   struct wl12xx_vif *wlvif)

{

	struct acx_beacon_filter_ie_table *ie_table;

	int i, idx = 0;
@@ -417,7 +423,7 @@ int wl1271_acx_beacon_filter_table(struct wl1271 *wl) 
	}



	/* configure default beacon pass-through rules */

	ie_table->role_id = wl->role_id;

	ie_table->role_id = wlvif->role_id;

	ie_table->num_ie = 0;

	for (i = 0; i < wl->conf.conn.bcn_filt_ie_count; i++) {

		struct conf_bcn_filt_rule *r = &(wl->conf.conn.bcn_filt_ie[i]);
@@ -458,7 +464,8 @@ int wl1271_acx_beacon_filter_table(struct wl1271 *wl) 


#define ACX_CONN_MONIT_DISABLE_VALUE  0xffffffff



int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable)

int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 bool enable)

{

	struct acx_conn_monit_params *acx;

	u32 threshold = ACX_CONN_MONIT_DISABLE_VALUE;
@@ -479,7 +486,7 @@ int wl1271_acx_conn_monit_params(struct wl1271 *wl, bool enable) 
		timeout = wl->conf.conn.bss_lose_timeout;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->synch_fail_thold = cpu_to_le32(threshold);

	acx->bss_lose_timeout = cpu_to_le32(timeout);
@@ -582,7 +589,7 @@ int wl1271_acx_cca_threshold(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_bcn_dtim_options(struct wl1271 *wl)

int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct acx_beacon_broadcast *bb;

	int ret;
@@ -595,7 +602,7 @@ int wl1271_acx_bcn_dtim_options(struct wl1271 *wl) 
		goto out;

	}



	bb->role_id = wl->role_id;

	bb->role_id = wlvif->role_id;

	bb->beacon_rx_timeout = cpu_to_le16(wl->conf.conn.beacon_rx_timeout);

	bb->broadcast_timeout = cpu_to_le16(wl->conf.conn.broadcast_timeout);

	bb->rx_broadcast_in_ps = wl->conf.conn.rx_broadcast_in_ps;
@@ -612,7 +619,7 @@ int wl1271_acx_bcn_dtim_options(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_aid(struct wl1271 *wl, u16 aid)

int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid)

{

	struct acx_aid *acx_aid;

	int ret;
@@ -625,7 +632,7 @@ int wl1271_acx_aid(struct wl1271 *wl, u16 aid) 
		goto out;

	}



	acx_aid->role_id = wl->role_id;

	acx_aid->role_id = wlvif->role_id;

	acx_aid->aid = cpu_to_le16(aid);



	ret = wl1271_cmd_configure(wl, ACX_AID, acx_aid, sizeof(*acx_aid));
@@ -668,7 +675,8 @@ int wl1271_acx_event_mbox_mask(struct wl1271 *wl, u32 event_mask) 
	return ret;

}



int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble)

int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			    enum acx_preamble_type preamble)

{

	struct acx_preamble *acx;

	int ret;
@@ -681,7 +689,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->preamble = preamble;



	ret = wl1271_cmd_configure(wl, ACX_PREAMBLE_TYPE, acx, sizeof(*acx));
@@ -695,7 +703,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble) 
	return ret;

}



int wl1271_acx_cts_protect(struct wl1271 *wl,

int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			   enum acx_ctsprotect_type ctsprotect)

{

	struct acx_ctsprotect *acx;
@@ -709,7 +717,7 @@ int wl1271_acx_cts_protect(struct wl1271 *wl, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->ctsprotect = ctsprotect;



	ret = wl1271_cmd_configure(wl, ACX_CTS_PROTECTION, acx, sizeof(*acx));
@@ -839,8 +847,8 @@ int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c, 
	return ret;

}



int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,

		      u8 aifsn, u16 txop)

int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		      u8 ac, u8 cw_min, u16 cw_max, u8 aifsn, u16 txop)

{

	struct acx_ac_cfg *acx;

	int ret = 0;
@@ -855,7 +863,7 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->ac = ac;

	acx->cw_min = cw_min;

	acx->cw_max = cpu_to_le16(cw_max);
@@ -873,7 +881,8 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max, 
	return ret;

}



int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,

int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		       u8 queue_id, u8 channel_type,

		       u8 tsid, u8 ps_scheme, u8 ack_policy,

		       u32 apsd_conf0, u32 apsd_conf1)

{
@@ -889,7 +898,7 @@ int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->queue_id = queue_id;

	acx->channel_type = channel_type;

	acx->tsid = tsid;
@@ -1098,7 +1107,8 @@ int wl1271_acx_init_rx_interrupt(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable)

int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			  bool enable)

{

	struct wl1271_acx_bet_enable *acx = NULL;

	int ret = 0;
@@ -1114,7 +1124,7 @@ int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->enable = enable ? CONF_BET_MODE_ENABLE : CONF_BET_MODE_DISABLE;

	acx->max_consecutive = wl->conf.conn.bet_max_consecutive;
@@ -1129,7 +1139,8 @@ int wl1271_acx_bet_enable(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address)

int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			     u8 enable, __be32 address)

{

	struct wl1271_acx_arp_filter *acx;

	int ret;
@@ -1142,7 +1153,7 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->version = ACX_IPV4_VERSION;

	acx->enable = enable;
@@ -1189,7 +1200,8 @@ int wl1271_acx_pm_config(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable)

int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			       bool enable)

{

	struct wl1271_acx_keep_alive_mode *acx = NULL;

	int ret = 0;
@@ -1202,7 +1214,7 @@ int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->enabled = enable;



	ret = wl1271_cmd_configure(wl, ACX_KEEP_ALIVE_MODE, acx, sizeof(*acx));
@@ -1216,7 +1228,8 @@ int wl1271_acx_keep_alive_mode(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid)

int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 u8 index, u8 tpl_valid)

{

	struct wl1271_acx_keep_alive_config *acx = NULL;

	int ret = 0;
@@ -1229,7 +1242,7 @@ int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->period = cpu_to_le32(wl->conf.conn.keep_alive_interval);

	acx->index = index;

	acx->tpl_validation = tpl_valid;
@@ -1247,8 +1260,8 @@ int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid) 
	return ret;

}



int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,

				s16 thold, u8 hyst)

int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				bool enable, s16 thold, u8 hyst)

{

	struct wl1271_acx_rssi_snr_trigger *acx = NULL;

	int ret = 0;
@@ -1263,7 +1276,7 @@ int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable, 


	wl->last_rssi_event = -1;



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->pacing = cpu_to_le16(wl->conf.roam_trigger.trigger_pacing);

	acx->metric = WL1271_ACX_TRIG_METRIC_RSSI_BEACON;

	acx->type = WL1271_ACX_TRIG_TYPE_EDGE;
@@ -1288,7 +1301,8 @@ int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable, 
	return ret;

}



int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl)

int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,

				    struct wl12xx_vif *wlvif)

{

	struct wl1271_acx_rssi_snr_avg_weights *acx = NULL;

	struct conf_roam_trigger_settings *c = &wl->conf.roam_trigger;
@@ -1302,7 +1316,7 @@ int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl) 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->rssi_beacon = c->avg_weight_rssi_beacon;

	acx->rssi_data = c->avg_weight_rssi_data;

	acx->snr_beacon = c->avg_weight_snr_beacon;
@@ -1367,6 +1381,7 @@ int wl1271_acx_set_ht_capabilities(struct wl1271 *wl, 
}



int wl1271_acx_set_ht_information(struct wl1271 *wl,

				   struct wl12xx_vif *wlvif,

				   u16 ht_operation_mode)

{

	struct wl1271_acx_ht_information *acx;
@@ -1380,7 +1395,7 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, 
		goto out;

	}



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->ht_protection =

		(u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION);

	acx->rifs_mode = 0;
@@ -1402,7 +1417,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, 
}



/* Configure BA session initiator/receiver parameters setting in the FW. */

int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl)

int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,

				       struct wl12xx_vif *wlvif)

{

	struct wl1271_acx_ba_initiator_policy *acx;

	int ret;
@@ -1416,7 +1432,7 @@ int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl) 
	}



	/* set for the current role */

	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	acx->tid_bitmap = wl->conf.ht.tx_ba_tid_bitmap;

	acx->win_size = wl->conf.ht.tx_ba_win_size;

	acx->inactivity_timeout = wl->conf.ht.inactivity_timeout;
@@ -1496,6 +1512,8 @@ int wl1271_acx_tsf_info(struct wl1271 *wl, u64 *mactime) 


int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable)

{

	struct ieee80211_vif *vif = wl->vif; /* TODO: get as param */

	struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);

	struct wl1271_acx_ps_rx_streaming *rx_streaming;

	u32 conf_queues, enable_queues;

	int i, ret = 0;
@@ -1523,7 +1541,7 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable) 
		if (!(conf_queues & BIT(i)))

			continue;



		rx_streaming->role_id = wl->role_id;

		rx_streaming->role_id = wlvif->role_id;

		rx_streaming->tid = i;

		rx_streaming->enable = enable_queues & BIT(i);

		rx_streaming->period = wl->conf.rx_streaming.interval;
@@ -1542,7 +1560,7 @@ int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl)

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct wl1271_acx_ap_max_tx_retry *acx = NULL;

	int ret;
@@ -1553,7 +1571,7 @@ int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl) 
	if (!acx)

		return -ENOMEM;



	acx->role_id = wl->role_id;

	acx->role_id = wlvif->role_id;

	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));

drivers/net/wireless/wl12xx/acx.h

+44 −27
Original line number Diff line number Diff line
@@ -1234,39 +1234,49 @@ enum { 
};





int wl1271_acx_wake_up_conditions(struct wl1271 *wl);

int wl1271_acx_wake_up_conditions(struct wl1271 *wl,

				  struct wl12xx_vif *wlvif);

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

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

int wl1271_acx_feature_cfg(struct wl1271 *wl);

int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			int power);

int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl1271_acx_mem_map(struct wl1271 *wl,

		       struct acx_header *mem_map, size_t len);

int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl);

int wl1271_acx_pd_threshold(struct wl1271 *wl);

int wl1271_acx_slot(struct wl1271 *wl, enum acx_slot_type slot_time);

int wl1271_acx_group_address_tbl(struct wl1271 *wl, bool enable,

				 void *mc_list, u32 mc_list_len);

int wl1271_acx_service_period_timeout(struct wl1271 *wl);

int wl1271_acx_rts_threshold(struct wl1271 *wl, u32 rts_threshold);

int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		    enum acx_slot_type slot_time);

int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 bool enable, void *mc_list, u32 mc_list_len);

int wl1271_acx_service_period_timeout(struct wl1271 *wl,

				      struct wl12xx_vif *wlvif);

int wl1271_acx_rts_threshold(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			     u32 rts_threshold);

int wl1271_acx_dco_itrim_params(struct wl1271 *wl);

int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, bool enable_filter);

int wl1271_acx_beacon_filter_table(struct wl1271 *wl);

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

int wl1271_acx_beacon_filter_opt(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 bool enable_filter);

int wl1271_acx_beacon_filter_table(struct wl1271 *wl,

				   struct wl12xx_vif *wlvif);

int wl1271_acx_conn_monit_params(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 bool enable);

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

int wl12xx_acx_sg_cfg(struct wl1271 *wl);

int wl1271_acx_cca_threshold(struct wl1271 *wl);

int wl1271_acx_bcn_dtim_options(struct wl1271 *wl);

int wl1271_acx_aid(struct wl1271 *wl, u16 aid);

int wl1271_acx_bcn_dtim_options(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl1271_acx_aid(struct wl1271 *wl, struct wl12xx_vif *wlvif, u16 aid);

int wl1271_acx_event_mbox_mask(struct wl1271 *wl, u32 event_mask);

int wl1271_acx_set_preamble(struct wl1271 *wl, enum acx_preamble_type preamble);

int wl1271_acx_cts_protect(struct wl1271 *wl,

int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			    enum acx_preamble_type preamble);

int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			   enum acx_ctsprotect_type ctsprotect);

int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats);

int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,

		      u8 idx);

int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,

		      u8 aifsn, u16 txop);

int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,

int wl1271_acx_ac_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		      u8 ac, u8 cw_min, u16 cw_max, u8 aifsn, u16 txop);

int wl1271_acx_tid_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		       u8 queue_id, u8 channel_type,

		       u8 tsid, u8 ps_scheme, u8 ack_policy,

		       u32 apsd_conf0, u32 apsd_conf1);

int wl1271_acx_frag_threshold(struct wl1271 *wl, u32 frag_threshold);
@@ -1276,25 +1286,32 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl); 
int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);

int wl1271_acx_init_rx_interrupt(struct wl1271 *wl);

int wl1271_acx_smart_reflex(struct wl1271 *wl);

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

int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 enable, __be32 address);

int wl1271_acx_bet_enable(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			  bool enable);

int wl1271_acx_arp_ip_filter(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			     u8 enable, __be32 address);

int wl1271_acx_pm_config(struct wl1271 *wl);

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

int wl1271_acx_keep_alive_config(struct wl1271 *wl, u8 index, u8 tpl_valid);

int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, bool enable,

				s16 thold, u8 hyst);

int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl);

int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *vif,

			       bool enable);

int wl1271_acx_keep_alive_config(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				 u8 index, u8 tpl_valid);

int wl1271_acx_rssi_snr_trigger(struct wl1271 *wl, struct wl12xx_vif *wlvif,

				bool enable, s16 thold, u8 hyst);

int wl1271_acx_rssi_snr_avg_weights(struct wl1271 *wl,

				    struct wl12xx_vif *wlvif);

int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,

				    struct ieee80211_sta_ht_cap *ht_cap,

				    bool allow_ht_operation, u8 hlid);

int wl1271_acx_set_ht_information(struct wl1271 *wl,

				   struct wl12xx_vif *wlvif,

				   u16 ht_operation_mode);

int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl);

int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl,

				       struct wl12xx_vif *wlvif);

int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index,

				       u16 ssn, bool enable, u8 peer_hlid);

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

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

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl);

int wl1271_acx_ap_max_tx_retry(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl12xx_acx_config_ps(struct wl1271 *wl, struct wl12xx_vif *wlvif);

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

int wl1271_acx_fm_coex(struct wl1271 *wl);

drivers/net/wireless/wl12xx/cmd.c

+17 −16
Original line number Diff line number Diff line
@@ -567,9 +567,9 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
		goto out;

	}



	wl1271_debug(DEBUG_CMD, "cmd role start sta %d", wl->role_id);

	wl1271_debug(DEBUG_CMD, "cmd role start sta %d", wlvif->role_id);



	cmd->role_id = wl->role_id;

	cmd->role_id = wlvif->role_id;

	if (wl->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;
@@ -592,7 +592,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) 


	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "

		     "basic_rate_set: 0x%x, remote_rates: 0x%x",

		     wl->role_id, cmd->sta.hlid, cmd->sta.session,

		     wlvif->role_id, cmd->sta.hlid, cmd->sta.session,

		     wlvif->basic_rate_set, wlvif->rate_set);



	ret = wl1271_cmd_send(wl, CMD_ROLE_START, cmd, sizeof(*cmd), 0);
@@ -615,7 +615,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
}



/* use this function to stop ibss as well */

int wl12xx_cmd_role_stop_sta(struct wl1271 *wl)

int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct wl12xx_cmd_role_stop *cmd;

	int ret;
@@ -629,9 +629,9 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl) 
		goto out;

	}



	wl1271_debug(DEBUG_CMD, "cmd role stop sta %d", wl->role_id);

	wl1271_debug(DEBUG_CMD, "cmd role stop sta %d", wlvif->role_id);



	cmd->role_id = wl->role_id;

	cmd->role_id = wlvif->role_id;

	cmd->disc_type = DISCONNECT_IMMEDIATE;

	cmd->reason = cpu_to_le16(WLAN_REASON_UNSPECIFIED);
@@ -656,7 +656,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	struct ieee80211_bss_conf *bss_conf = &wl->vif->bss_conf;

	int ret;



	wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wl->role_id);

	wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wlvif->role_id);



	/* trying to use hidden SSID with an old hostapd version */

	if (wlvif->ssid_len == 0 && !bss_conf->hidden_ssid) {
@@ -679,7 +679,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	if (ret < 0)

		goto out_free_global;



	cmd->role_id = wl->role_id;

	cmd->role_id = wlvif->role_id;

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

	cmd->ap.bss_index = WL1271_AP_BSS_INDEX;

	cmd->ap.global_hlid = wl->ap_global_hlid;
@@ -737,7 +737,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	return ret;

}



int wl12xx_cmd_role_stop_ap(struct wl1271 *wl)

int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	struct wl12xx_cmd_role_stop *cmd;

	int ret;
@@ -748,9 +748,9 @@ int wl12xx_cmd_role_stop_ap(struct wl1271 *wl) 
		goto out;

	}



	wl1271_debug(DEBUG_CMD, "cmd role stop ap %d", wl->role_id);

	wl1271_debug(DEBUG_CMD, "cmd role stop ap %d", wlvif->role_id);



	cmd->role_id = wl->role_id;

	cmd->role_id = wlvif->role_id;



	ret = wl1271_cmd_send(wl, CMD_ROLE_STOP, cmd, sizeof(*cmd), 0);

	if (ret < 0) {
@@ -781,9 +781,9 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
		goto out;

	}



	wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wl->role_id);

	wl1271_debug(DEBUG_CMD, "cmd role start ibss %d", wlvif->role_id);



	cmd->role_id = wl->role_id;

	cmd->role_id = wlvif->role_id;

	if (wl->band == IEEE80211_BAND_5GHZ)

		cmd->band = WL12XX_BAND_5GHZ;

	cmd->channel = wl->channel;
@@ -806,7 +806,7 @@ int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif) 


	wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d "

		     "basic_rate_set: 0x%x, remote_rates: 0x%x",

		     wl->role_id, cmd->sta.hlid, cmd->sta.session,

		     wlvif->role_id, cmd->sta.hlid, cmd->sta.session,

		     wlvif->basic_rate_set, wlvif->rate_set);



	wl1271_debug(DEBUG_CMD, "vif->bss_conf.bssid = %pM",
@@ -966,7 +966,8 @@ int wl1271_cmd_data_path(struct wl1271 *wl, bool enable) 
	return ret;

}



int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode)

int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		       u8 ps_mode)

{

	struct wl1271_cmd_ps_params *ps_params = NULL;

	int ret = 0;
@@ -979,7 +980,7 @@ int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode) 
		goto out;

	}



	ps_params->role_id = wl->role_id;

	ps_params->role_id = wlvif->role_id;

	ps_params->ps_mode = ps_mode;



	ret = wl1271_cmd_send(wl, CMD_SET_PS_MODE, ps_params,

drivers/net/wireless/wl12xx/cmd.h

+4 −3
Original line number Diff line number Diff line
@@ -42,15 +42,16 @@ int wl12xx_cmd_role_disable(struct wl1271 *wl, u8 *role_id); 
int wl12xx_cmd_role_start_dev(struct wl1271 *wl);

int wl12xx_cmd_role_stop_dev(struct wl1271 *wl);

int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl12xx_cmd_role_stop_sta(struct wl1271 *wl);

int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl12xx_cmd_role_stop_ap(struct wl1271 *wl);

int wl12xx_cmd_role_stop_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl12xx_cmd_role_start_ibss(struct wl1271 *wl, struct wl12xx_vif *wlvif);

int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer);

int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len);

int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len);

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

int wl1271_cmd_ps_mode(struct wl1271 *wl, u8 ps_mode);

int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		       u8 ps_mode);

int wl1271_cmd_read_memory(struct wl1271 *wl, u32 addr, void *answer,

			   size_t len);

int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,

drivers/net/wireless/wl12xx/debugfs.c

+9 −1
Original line number Diff line number Diff line
@@ -620,11 +620,19 @@ static ssize_t beacon_filtering_write(struct file *file, 
				      size_t count, loff_t *ppos)

{

	struct wl1271 *wl = file->private_data;

	struct ieee80211_vif *vif;

	struct wl12xx_vif *wlvif;

	char buf[10];

	size_t len;

	unsigned long value;

	int ret;



	if (!wl->vif)

		return -EINVAL;



	vif = wl->vif;

	wlvif = wl12xx_vif_to_data(vif);



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;
@@ -642,7 +650,7 @@ static ssize_t beacon_filtering_write(struct file *file, 
	if (ret < 0)

		goto out;



	ret = wl1271_acx_beacon_filter_opt(wl, !!value);

	ret = wl1271_acx_beacon_filter_opt(wl, wlvif, !!value);



	wl1271_ps_elp_sleep(wl);

out: