Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57171
b: refs/heads/master
c: e8fdeca
h: refs/heads/master
i:
  57169: e2b388f
  57167: 4ce5b69
v: v3
  • Loading branch information
Hong Liu authored and John W. Linville committed May 29, 2007
1 parent d46697d commit 74c6349
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: f11b0f0eb2ea7562db63a01c60d398ec52d5ea46
refs/heads/master: e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9
4 changes: 3 additions & 1 deletion trunk/net/mac80211/ieee80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -3278,8 +3278,10 @@ ieee80211_rx_h_defragment(struct ieee80211_txrx_data *rx)
return TXRX_DROP;
}
}
while ((skb = __skb_dequeue(&entry->skb_list)))
while ((skb = __skb_dequeue(&entry->skb_list))) {
memcpy(skb_put(rx->skb, skb->len), skb->data, skb->len);
dev_kfree_skb(skb);
}

/* Complete frame has been reassembled - process it now */
rx->fragmented = 1;
Expand Down

0 comments on commit 74c6349

Please sign in to comment.