← Back to branch summary

~ubuntu-branches/ubuntu/vivid/linux-backports-modules-3.2.0/vivid

« back to all changes in this revision

Viewing changes to updates/cw-3.3/drivers/net/wireless/ath/carl9170/tx.c

  • Committer: Package Import Robot
  • Author(s): Leann Ogasawara
  • Date: 2012-03-29 09:17:55 UTC
  • Revision ID: package-import@ubuntu.com-20120329091755-1xmgit6xf3ch02r5
Tags: 3.2.0-21.4
* Update to compat-wireless-3.3-2-n 
* Bump ABI for Precise 3.2.0-21.34 

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/cw-3.3/drivers/net/wireless/ath/carl9170/tx.c
1234
1234
{
1235
1235
        struct ieee80211_sta *sta;
1236
1236
        struct carl9170_sta_info *sta_info;
 
1237
        struct ieee80211_tx_info *tx_info;
1237
1238
 
1238
1239
        rcu_read_lock();
1239
1240
        sta = __carl9170_get_tx_sta(ar, skb);
1241
1242
                goto out_rcu;
1242
1243
 
1243
1244
        sta_info = (void *) sta->drv_priv;
1244
 
        if (unlikely(sta_info->sleeping)) {
1245
 
                struct ieee80211_tx_info *tx_info;
 
1245
        tx_info = IEEE80211_SKB_CB(skb);
1246
1246
 
 
1247
        if (unlikely(sta_info->sleeping) &&
 
1248
            !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
 
1249
                                IEEE80211_TX_CTL_CLEAR_PS_FILT))) {
1247
1250
                rcu_read_unlock();
1248
1251
 
1249
 
                tx_info = IEEE80211_SKB_CB(skb);
1250
1252
                if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
1251
1253
                        atomic_dec(&ar->tx_ampdu_upload);
1252
1254
 
1253
1255
                tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
 
1256
                carl9170_release_dev_space(ar, skb);
1254
1257
                carl9170_tx_status(ar, skb, false);
1255
1258
                return true;
1256
1259
        }