From patchwork Sun Jan 19 21:22:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 3750 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=212.227.15.14; helo=mout.web.de; envelope-from=linus.luessing@web.de; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from mout.web.de (mout.web.de [212.227.15.14]) by open-mesh.org (Postfix) with ESMTPS id 69EF36023E2 for ; Sun, 19 Jan 2014 22:23:03 +0100 (CET) Received: from localhost ([95.211.148.154]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0LnBTZ-1VOXjq0XCn-00hJDA for ; Sun, 19 Jan 2014 22:23:02 +0100 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 19 Jan 2014 22:22:46 +0100 Message-Id: <1390166566-8315-3-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390166566-8315-1-git-send-email-linus.luessing@web.de> References: <1390166566-8315-1-git-send-email-linus.luessing@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:mm116/FnYG1StmvXXuk/Ign5gwwLl/d99vfbsA2gU+O5MPBH3oF CzMQ1+ESChF71VXyOJQAqjHbW/w8BZ4gw9C9UDCiYRv7JV16CuDQJQBh5Ircv7rZJ4/isJ6 GaukZSB/FzrTzxQ40wU5gadclayXgWfeVM9XiEMQsjrzdxB82tI+ZEaxBtwno28FzQeA63s j3V4D7n5zz9mtFssru1HQ== Subject: [B.A.T.M.A.N.] [PATCHv6 2/2] batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 21:23:03 -0000 Our .ndo_start_xmit handler (batadv_interface_tx()) can rely on having the skb mac header pointer set correctly since the following commit present in kernels >= 3.9: "net: reset mac header in dev_start_xmit()" (6d1ccff627) Therefore this commit removes the according, now redundant, skb_reset_mac_header() call in batadv_bla_tx(). Signed-off-by: Linus Lüssing --- bridge_loop_avoidance.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 407299a..e69d795 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1535,9 +1535,6 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, if (!atomic_read(&bat_priv->bridge_loop_avoidance)) goto allow; - /* in VLAN case, the mac header might not be set. */ - skb_reset_mac_header(skb); - if (batadv_bla_process_claim(bat_priv, primary_if, skb)) goto handled;