---

yaml --- r: 315630 b: refs/heads/master c: 7c41f31 h: refs/heads/master v: v3
git-mirror · Jul 11, 2012 · 009f5a4 · 009f5a4
1 parent cd09dc2
commit 009f5a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 353d09c6ceedc1cb0c54fe5002c0ca80b6ee6e4f
+refs/heads/master: 7c41f3159ca4f04dfc22c791fd96d3d057dcaf90
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
@@ -1836,6 +1836,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
 					/* RA TA mDA mSA AE:DA SA */
 					mesh_da = mppath->mpp;
 					is_mesh_mcast = 0;
+				} else if (mpath) {
+					mesh_da = mpath->dst;
+					is_mesh_mcast = 0;
 				} else {
 					/* DA TA mSA AE:SA */
 					mesh_da = bcast;