Commit 10c836d7 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville

mac80211: Assign next hop address to pending mesh frames

Assign next hop address to pending mesh frames once the path is resolved.

Regression.  Frames transmitted when a mesh path was wating to be resolved were
being transmitted with an invalid Receiver Address.

[Changes since v1]

Suggested by Johannes:
 - Improved frame_queue traversal
 - Narower RCU scope
Signed-off-by: default avatarJavier Cardona <>
Signed-off-by: default avatarAndrey Yurovsky <>
Signed-off-by: default avatarJohn W. Linville <>
parent 4bde0f7d
......@@ -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);
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment