From patchwork Sat Jun 1 00:41:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2646321 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4E4083FD4E for ; Sat, 1 Jun 2013 00:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755170Ab3FAAoK (ORCPT ); Fri, 31 May 2013 20:44:10 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:40497 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755009Ab3FAAoI (ORCPT ); Fri, 31 May 2013 20:44:08 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz10so270776pad.30 for ; Fri, 31 May 2013 17:44:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=/N8W22uUeQc+tcfrdI8fFQSEzIfNvPZKrsBajjBF7Yg=; b=H+b90dROAdKSv/rKTmnuQ8M9ySt35TsbfXU2jN4TFSeB1cqxO9TFxKGA6D9DnE2Gr+ OlDBekKQv4RniQbwrJ9zR9jB9YDqDQjSLl/zyudiY35xH9Bw/euXx8a0KBqQA0wDx0Np GviO/qn8nmuCiYCOezu86W7dXCT/C6kCB401GOA0+IShQqgY344qvaIRSmx7RhCMW4yK pdClGkhEnF2rD5VQRCrJWfHD0k+5+jbODFjb3DsnUObLGRMCjxOSvkTIMUXe8aDQmwyS pG2tLkJ0RuX90QZafKOOgJ6iEY349TV4wbgzutAsbg7BL6jcgKfAe+FOPdP6C9D7bRGZ f/Wg== X-Received: by 10.66.197.202 with SMTP id iw10mr15661271pac.178.1370047448150; Fri, 31 May 2013 17:44:08 -0700 (PDT) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id bs2sm51935077pad.17.2013.05.31.17.44.06 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 17:44:07 -0700 (PDT) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , open80211s , Thomas Pedersen Subject: [PATCH] mac80211: don't check local mesh TTL on TX Date: Fri, 31 May 2013 17:41:47 -0700 Message-Id: <1370047307-19248-1-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnZjnAo5iuVBC70mModHwAfK9XU/3b+zQlFnxltad9AK+vg3A2QOgNZySwL9Im50jR1F34o Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- 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;