From 74c6349d7d2fec8878dd07de9342ab00bda76c65 Mon Sep 17 00:00:00 2001 From: Hong Liu Date: Thu, 17 May 2007 11:13:44 +0800 Subject: [PATCH] --- yaml --- r: 57171 b: refs/heads/master c: e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 h: refs/heads/master i: 57169: e2b388fe86d404b1b7185ceffd5f4d27c576c71c 57167: 4ce5b699e2ac355a2bb0520561749e89b1acca1f v: v3 --- [refs] | 2 +- trunk/net/mac80211/ieee80211.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e6bcbed61634..cece733f755e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f11b0f0eb2ea7562db63a01c60d398ec52d5ea46 +refs/heads/master: e8fdeca241e17dcc5b8f2465be8e1a6347c62fb9 diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c index 6e36df67f8d5..145604abd08e 100644 --- a/trunk/net/mac80211/ieee80211.c +++ b/trunk/net/mac80211/ieee80211.c @@ -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;