xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem

Browse Source
This commit is contained in:
John W. Linville
2011-09-19 15:00:16 -04:00
parent 765cf9976e 12e62d6f7e
commit b53d63ecce
137 changed files with 9895 additions and 4629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/mac80211/sta_info.c
View File

@@ -691,14 +691,13 @@ void sta_info_clear_tim_bit(struct sta_info *sta)
spin_unlock_irqrestore(&sta->local->sta_lock, flags);
}
static int sta_info_buffer_expired(struct sta_info *sta,
struct sk_buff *skb)
static bool sta_info_buffer_expired(struct sta_info *sta, struct sk_buff *skb)
{
struct ieee80211_tx_info *info;
int timeout;
if (!skb)
return 0;
return false;
info = IEEE80211_SKB_CB(skb);
@@ -718,9 +717,6 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
unsigned long flags;
struct sk_buff *skb;
if (skb_queue_empty(&sta->ps_tx_buf))
return false;
for (;;) {
spin_lock_irqsave(&sta->ps_tx_buf.lock, flags);
skb = skb_peek(&sta->ps_tx_buf);
@@ -745,7 +741,7 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
sta_info_clear_tim_bit(sta);
}
return true;
return !skb_queue_empty(&sta->ps_tx_buf);
}
static int __must_check __sta_info_destroy(struct sta_info *sta)