From 3ace7d51885bf8d3c6dca2e9dfb9099a0f7fb35a Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 24 Aug 2011 15:12:41 -0400
Subject: [PATCH] --- yaml --- r: 265824 b: refs/heads/master c:
 817a53d9866ab4118e2dd17a9ffe80700eac40ac h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/net/mac80211/mesh_pathtbl.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a2b2664bb4b6..221832271e7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b38de31ffa870323c4f6957904303477c88fe905
+refs/heads/master: 817a53d9866ab4118e2dd17a9ffe80700eac40ac
diff --git a/trunk/net/mac80211/mesh_pathtbl.c b/trunk/net/mac80211/mesh_pathtbl.c
index 3c2bcb2de844..ede4f5242e0b 100644
--- a/trunk/net/mac80211/mesh_pathtbl.c
+++ b/trunk/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);