Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103268
b: refs/heads/master
c: 5479d0e
h: refs/heads/master
v: v3
  • Loading branch information
Tomas Winkler authored and John W. Linville committed Jun 30, 2008
1 parent 02272f6 commit 85adf24
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7cd8d3ea5173bb4b0dc3e84497048a5e3a14aec8
refs/heads/master: 5479d0e73958710b9a255337eaa2ba47eb492def
5 changes: 2 additions & 3 deletions trunk/net/mac80211/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,6 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
*/
static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
{
struct ieee80211_local *local = tx->local;
struct sk_buff *skb = tx->skb;
ieee80211_tx_handler *handler;
ieee80211_tx_result res = TX_DROP;
Expand All @@ -1123,15 +1122,15 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
}

if (unlikely(res == TX_DROP)) {
I802_DEBUG_INC(local->tx_handlers_drop);
I802_DEBUG_INC(tx->local->tx_handlers_drop);
dev_kfree_skb(skb);
for (i = 0; i < tx->num_extra_frag; i++)
if (tx->extra_frag[i])
dev_kfree_skb(tx->extra_frag[i]);
kfree(tx->extra_frag);
return -1;
} else if (unlikely(res == TX_QUEUED)) {
I802_DEBUG_INC(local->tx_handlers_queued);
I802_DEBUG_INC(tx->local->tx_handlers_queued);
return -1;
}

Expand Down

0 comments on commit 85adf24

Please sign in to comment.