diff --git a/[refs] b/[refs] index 5043541cf39e..d71d985936f4 100644 --- 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 index 85cf32d2f7b5..eab0d19eb4bd 100644 --- 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;