Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 163df6cf authored by Chun-Yeow Yeoh's avatar Chun-Yeow Yeoh Committed by Johannes Berg
Browse files

mac80211: fix the problem of forwarding from DS to DS in Mesh 



Unicast frame with unknown forwarding information always trigger
the path discovery assuming destination is always located inside the
MBSS. This patch allows the forwarding to look for mesh gate if path
discovery inside the MBSS has failed.

Reported-by: default avatarCedric Voncken <cedric.voncken@acksys.fr>
Signed-off-by: default avatarChun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 162589f7

net/mac80211/tx.c

+16 −1
Original line number Diff line number Diff line
@@ -1844,9 +1844,24 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 
		}



		if (!is_multicast_ether_addr(skb->data)) {

			struct sta_info *next_hop;

			bool mpp_lookup = true;



			mpath = mesh_path_lookup(sdata, skb->data);

			if (!mpath)

			if (mpath) {

				mpp_lookup = false;

				next_hop = rcu_dereference(mpath->next_hop);

				if (!next_hop ||

				    !(mpath->flags & (MESH_PATH_ACTIVE |

						      MESH_PATH_RESOLVING)))

					mpp_lookup = true;

			}



			if (mpp_lookup)

				mppath = mpp_path_lookup(sdata, skb->data);



			if (mppath && mpath)

				mesh_path_del(mpath->sdata, mpath->dst);

		}



		/*