mac80211: Fix the Problem of Unreachable Mesh STA from DS

This patch fixes the problem of unreachable mesh STA from
Distribution System (DS) due to the introduction of previous
patch solving the mesh STA joining from one MBSS to another
MBSS.

Reported-by: Georgiewskiy Yuriy <bottleman@icf.org.ru>
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 85cf32d2f7b50084ca4f0d7476125e1fe72741cc..eab0d19eb4bd82f5511abdb29a47ee2321673b47 100644 (file)
--- a/net/mac80211/tx.c
+++ b/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;