Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

[pandora-kernel.git] / net / mac80211 / ht.c

diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 7cfc286..f80a35c 100644 (file)
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -130,7 +130,7 @@ void ieee80211_ba_session_work(struct work_struct *work)
         * down by the code that set the flag, so this
         * need not run.
         */
-       if (test_sta_flags(sta, WLAN_STA_BLOCK_BA))
+       if (test_sta_flag(sta, WLAN_STA_BLOCK_BA))
                return;
 
        mutex_lock(&sta->ampdu_mlme.mtx);
@@ -186,12 +186,8 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
        u16 params;
 
        skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom);
-
-       if (!skb) {
-               printk(KERN_ERR "%s: failed to allocate buffer "
-                                       "for delba frame\n", sdata->name);
+       if (!skb)
                return;
-       }
 
        skb_reserve(skb, local->hw.extra_tx_headroom);
        mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);