Commit 69e2a771 authored by Andreea-Cristina Bernat's avatar Andreea-Cristina Bernat Committed by John W. Linville

carl9170: Remove redundant protection check

The carl9170_op_ampdu_action() function is used only by the mac80211
framework.
Since the mac80211 already takes care of checks and properly serializing
calls to the driver's function there is no need for the driver to do the same
thing.
Signed-off-by: default avatarAndreea-Cristina Bernat <bernat.ada@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 499afacc
...@@ -1430,18 +1430,10 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, ...@@ -1430,18 +1430,10 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
if (!sta_info->ht_sta) if (!sta_info->ht_sta)
return -EOPNOTSUPP; return -EOPNOTSUPP;
rcu_read_lock();
if (rcu_dereference(sta_info->agg[tid])) {
rcu_read_unlock();
return -EBUSY;
}
tid_info = kzalloc(sizeof(struct carl9170_sta_tid), tid_info = kzalloc(sizeof(struct carl9170_sta_tid),
GFP_ATOMIC); GFP_ATOMIC);
if (!tid_info) { if (!tid_info)
rcu_read_unlock();
return -ENOMEM; return -ENOMEM;
}
tid_info->hsn = tid_info->bsn = tid_info->snx = (*ssn); tid_info->hsn = tid_info->bsn = tid_info->snx = (*ssn);
tid_info->state = CARL9170_TID_STATE_PROGRESS; tid_info->state = CARL9170_TID_STATE_PROGRESS;
...@@ -1460,7 +1452,6 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, ...@@ -1460,7 +1452,6 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
list_add_tail_rcu(&tid_info->list, &ar->tx_ampdu_list); list_add_tail_rcu(&tid_info->list, &ar->tx_ampdu_list);
rcu_assign_pointer(sta_info->agg[tid], tid_info); rcu_assign_pointer(sta_info->agg[tid], tid_info);
spin_unlock_bh(&ar->tx_ampdu_list_lock); spin_unlock_bh(&ar->tx_ampdu_list_lock);
rcu_read_unlock();
ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment