aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-05-31 20:41:47 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-06-03 10:53:51 -0400
commit866403a7bdd3941cbb4e2085d8ac368dcabe800c (patch)
tree4d9a178aed0d88545dd4a6181902c2ddaed65218 /net/mac80211
parented405be5cb5e8e494e8dcd83b6eb1add34dc752a (diff)
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 <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/tx.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 34be9336b5d1..4105d0ca963e 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,
1790 break; 1790 break;
1791#ifdef CONFIG_MAC80211_MESH 1791#ifdef CONFIG_MAC80211_MESH
1792 case NL80211_IFTYPE_MESH_POINT: 1792 case NL80211_IFTYPE_MESH_POINT:
1793 if (!sdata->u.mesh.mshcfg.dot11MeshTTL) {
1794 /* Do not send frames with mesh_ttl == 0 */
1795 sdata->u.mesh.mshstats.dropped_frames_ttl++;
1796 goto fail_rcu;
1797 }
1798
1799 if (!is_multicast_ether_addr(skb->data)) { 1793 if (!is_multicast_ether_addr(skb->data)) {
1800 struct sta_info *next_hop; 1794 struct sta_info *next_hop;
1801 bool mpp_lookup = true; 1795 bool mpp_lookup = true;