diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:41:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:41:16 -0400 |
commit | b4d3de8ca25fcdf697da38d9f9785cb508edea4d (patch) | |
tree | 8d2940fab556b05f4f1c7980c611211ffaa0f025 /net/mac80211/mesh_pathtbl.c | |
parent | 3857e3ee2209b7289c434103e366f765ec82a22d (diff) | |
parent | 2fa8b6a0e42570690a48a56cb65778211e3cc9cc (diff) |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
-rw-r--r-- | net/mac80211/mesh_pathtbl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 7fde32159fdc..f97d17cb073c 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c | |||
@@ -307,14 +307,14 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath, | |||
307 | 307 | ||
308 | while (num_skbs--) { | 308 | while (num_skbs--) { |
309 | skb = __skb_dequeue(&failq); | 309 | skb = __skb_dequeue(&failq); |
310 | if (copy) | 310 | if (copy) { |
311 | cp_skb = skb_copy(skb, GFP_ATOMIC); | 311 | cp_skb = skb_copy(skb, GFP_ATOMIC); |
312 | if (cp_skb) | ||
313 | __skb_queue_tail(&failq, cp_skb); | ||
314 | } | ||
312 | 315 | ||
313 | prepare_for_gate(skb, gate_mpath->dst, gate_mpath); | 316 | prepare_for_gate(skb, gate_mpath->dst, gate_mpath); |
314 | __skb_queue_tail(&gateq, skb); | 317 | __skb_queue_tail(&gateq, skb); |
315 | |||
316 | if (copy && cp_skb) | ||
317 | __skb_queue_tail(&failq, cp_skb); | ||
318 | } | 318 | } |
319 | 319 | ||
320 | spin_lock_irqsave(&gate_mpath->frame_queue.lock, flags); | 320 | spin_lock_irqsave(&gate_mpath->frame_queue.lock, flags); |