From 129a1a7a83faacab6e3af2fc3e9c01631dbcf7fd Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Thu, 9 Jul 2009 14:42:16 -0700
Subject: [PATCH] --- yaml --- r: 159073 b: refs/heads/master c:
 10c836d7896e9d7b683a76f3cac3c289d8da72ef h: refs/heads/master i:   159071:
 b27bc0f736bfc6f60b8dbbb2b8ec085e5dd58d25 v: v3

---
 [refs]                            |  2 +-
 trunk/net/mac80211/mesh_pathtbl.c | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b0459c1da97..c28eb6002381 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bde0f7d1dca0a7d886997eb8dee3fb47a6484e4
+refs/heads/master: 10c836d7896e9d7b683a76f3cac3c289d8da72ef
diff --git a/trunk/net/mac80211/mesh_pathtbl.c b/trunk/net/mac80211/mesh_pathtbl.c
index 479597e88583..f0304bfdcdff 100644
--- a/trunk/net/mac80211/mesh_pathtbl.c
+++ b/trunk/net/mac80211/mesh_pathtbl.c
@@ -55,7 +55,25 @@ static DEFINE_RWLOCK(pathtbl_resize_lock);
  */
 void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta)
 {
+	struct sk_buff *skb;
+	struct ieee80211_hdr *hdr;
+	struct sk_buff_head tmpq;
+	unsigned long flags;
+
 	rcu_assign_pointer(mpath->next_hop, sta);
+
+	__skb_queue_head_init(&tmpq);
+
+	spin_lock_irqsave(&mpath->frame_queue.lock, flags);
+
+	while ((skb = __skb_dequeue(&mpath->frame_queue)) != NULL) {
+		hdr = (struct ieee80211_hdr *) skb->data;
+		memcpy(hdr->addr1, sta->sta.addr, ETH_ALEN);
+		__skb_queue_tail(&tmpq, skb);
+	}
+
+	skb_queue_splice(&tmpq, &mpath->frame_queue);
+	spin_unlock_irqrestore(&mpath->frame_queue.lock, flags);
 }