2013-06-01 00:44:08

by Thomas Pedersen

Subject: [PATCH] mac80211: don't check local mesh TTL on TX

nl80211 has already verified the mesh TTL on setting the
mesh config, so no need to check it again in mac80211.

Signed-off-by: Thomas Pedersen <[email protected]>
---
net/mac80211/tx.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 34be933..4105d0c 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1790,12 +1790,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
break;
#ifdef CONFIG_MAC80211_MESH
case NL80211_IFTYPE_MESH_POINT:
- if (!sdata->u.mesh.mshcfg.dot11MeshTTL) {
- /* Do not send frames with mesh_ttl == 0 */
- sdata->u.mesh.mshstats.dropped_frames_ttl++;
- goto fail_rcu;
- }
-
if (!is_multicast_ether_addr(skb->data)) {
struct sta_info *next_hop;
bool mpp_lookup = true;
--
1.7.10.4

2013-06-03 14:54:19

by Johannes Berg

Subject: Re: [PATCH] mac80211: don't check local mesh TTL on TX

On Fri, 2013-05-31 at 17:41 -0700, Thomas Pedersen wrote:
> nl80211 has already verified the mesh TTL on setting the
> mesh config, so no need to check it again in mac80211.

makes sense, applied.

johannes