Skip to content

Commit

Permalink
wl12xx: remove redundant code from wl1271_op_conf_tx
Browse files Browse the repository at this point in the history
Since the conf_tx callback passes the vif as param,
we must have been added first (and mac80211 verifies it).

Remove the handling of such case.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Dec 20, 2011
1 parent c0fad1b commit 5b37ddf
Showing 1 changed file with 1 addition and 24 deletions.
25 changes: 1 addition & 24 deletions drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3959,31 +3959,8 @@ static int wl1271_op_conf_tx(struct ieee80211_hw *hw,
else
ps_scheme = CONF_PS_SCHEME_LEGACY;

if (wl->state == WL1271_STATE_OFF) {
/*
* If the state is off, the parameters will be recorded and
* configured on init. This happens in AP-mode.
*/
struct conf_tx_ac_category *conf_ac =
&wl->conf.tx.ac_conf[wl1271_tx_get_queue(queue)];
struct conf_tx_tid *conf_tid =
&wl->conf.tx.tid_conf[wl1271_tx_get_queue(queue)];

conf_ac->ac = wl1271_tx_get_queue(queue);
conf_ac->cw_min = (u8)params->cw_min;
conf_ac->cw_max = params->cw_max;
conf_ac->aifsn = params->aifs;
conf_ac->tx_op_limit = params->txop << 5;

conf_tid->queue_id = wl1271_tx_get_queue(queue);
conf_tid->channel_type = CONF_CHANNEL_TYPE_EDCF;
conf_tid->tsid = wl1271_tx_get_queue(queue);
conf_tid->ps_scheme = ps_scheme;
conf_tid->ack_policy = CONF_ACK_POLICY_LEGACY;
conf_tid->apsd_conf[0] = 0;
conf_tid->apsd_conf[1] = 0;
if (!test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
goto out;
}

ret = wl1271_ps_elp_wakeup(wl);
if (ret < 0)
Expand Down

0 comments on commit 5b37ddf

Please sign in to comment.