Skip to contentSkip to conversation

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

PATCH Applied Chun-Yeow Yeoh 2 participants 2 messages Feb 19, 2013 – Feb 20, 2013 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
v2: rebase on mac80211-next and redefine the logic clearer (Johannes & Thomas)

 net/mac80211/tx.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
net/mac80211/tx.c +16 -1
index 5b9602b..c79860f 100644
@@ -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);
 		}
 
 		/*
Signature · 1 line
1.7.0.4
maintainer Applied
#1 lore raw
Quoted 9 lines · Chun-Yeow Yeoh

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.

---
v2: rebase on mac80211-next and redefine the logic clearer (Johannes & Thomas)

Applied.

FWIW, I'm ok with removing the path right there, it just seemed odd to me on first glance.

johannes