summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_pathtbl.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-09-13 15:41:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-13 15:41:16 -0400
commitb4d3de8ca25fcdf697da38d9f9785cb508edea4d (patch)
tree8d2940fab556b05f4f1c7980c611211ffaa0f025 /net/mac80211/mesh_pathtbl.c
parent3857e3ee2209b7289c434103e366f765ec82a22d (diff)
parent2fa8b6a0e42570690a48a56cb65778211e3cc9cc (diff)
downloadop-kernel-dev-b4d3de8ca25fcdf697da38d9f9785cb508edea4d.zip
op-kernel-dev-b4d3de8ca25fcdf697da38d9f9785cb508edea4d.tar.gz
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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 7fde321..f97d17c 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,
while (num_skbs--) {
skb = __skb_dequeue(&failq);
- if (copy)
+ if (copy) {
cp_skb = skb_copy(skb, GFP_ATOMIC);
+ if (cp_skb)
+ __skb_queue_tail(&failq, cp_skb);
+ }
prepare_for_gate(skb, gate_mpath->dst, gate_mpath);
__skb_queue_tail(&gateq, skb);
-
- if (copy && cp_skb)
- __skb_queue_tail(&failq, cp_skb);
}
spin_lock_irqsave(&gate_mpath->frame_queue.lock, flags);
OpenPOWER on IntegriCloud