From patchwork Thu May 30 06:37:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 3141 Return-Path: Received: from nm5-vm6.bullet.mail.sg3.yahoo.com (nm5-vm6.bullet.mail.sg3.yahoo.com [106.10.148.149]) by open-mesh.org (Postfix) with ESMTPS id DEB5C600745 for ; Thu, 30 May 2013 08:37:32 +0200 (CEST) Received: from [106.10.166.114] by nm5.bullet.mail.sg3.yahoo.com with NNFMP; 30 May 2013 06:37:29 -0000 Received: from [106.10.167.164] by tm3.bullet.mail.sg3.yahoo.com with NNFMP; 30 May 2013 06:37:29 -0000 Received: from [127.0.0.1] by smtp137.mail.sg3.yahoo.com with NNFMP; 30 May 2013 06:37:29 -0000 X-Yahoo-Newman-Id: 7758.63750.bm@smtp137.mail.sg3.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: ZPXSLEAVM1mFZ6ZFiajyAjR4y1yge4Jc3teXgf94lECovND w55jaOfKAy.5YV.9d.UnLJfgyzPULQ9VB0y93eF2urxXh.lyjP5PdMmC5TMz m8aCHXvy2QXf.U.cVxX9VBbuEpCujLO2JgLMijdVW2hH.PGz7nOZs29.GOSf zlj8z0ZKHf6LKKfUjZaFJjnUJgXyv054jpD1TMw8jH267jzLCra.VuEJfBrH _3cvMGdQekjG1fLMSEXdxvmKW5ZER8uQTT51L_71.eh3f_YrjvpxpYPEXsaH qAAWOUHDaNNDf3q8fWrDXv1grao_Adn3O4oOPgswC.RhapBTvbzQhVrBfTVD GwHQ7vZymq7o_p.Bwke5Z4qq1Lc7FoqJdvCkyBC8_VaLOIqo61puahMsJXeR Pq0N5JjAlBrIlnRGKiJVaZLoY35vaKKMZU4Bx3QE7aZNqhjVywmjGKQW2VYL zYp9kTv5mJTjuXQKoPBO7Unhhdg-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-Rocket-Received: from localhost (lindner_marek@1.36.73.90 with ) by smtp137.mail.sg3.yahoo.com with SMTP; 29 May 2013 23:37:28 -0700 PDT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 30 May 2013 14:37:10 +0800 Message-Id: <1369895830-8588-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.10.4 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: remove obsolete variable 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: Thu, 30 May 2013 06:37:34 -0000 Introduced by 1ab746a3f2441d3466592b86134fbc72a9fe0558 ("batman-adv: properly align tvlv infrastructure") Signed-off-by: Marek Lindner --- main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.c b/main.c index 1192e61..5d30fe0 100644 --- a/main.c +++ b/main.c @@ -1043,7 +1043,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, struct batadv_orig_node *orig_node; struct sk_buff *skb = NULL; unsigned char *tvlv_buff; - unsigned int tvlv_len, tvlv_long_hdr = 0; + unsigned int tvlv_len; ssize_t hdr_len = sizeof(*unicast_tvlv_packet); bool ret = false; @@ -1051,9 +1051,6 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, if (!orig_node) goto out; - if (tvlv_value_len > 255) - tvlv_long_hdr = 1; - tvlv_len = sizeof(*tvlv_hdr) + tvlv_value_len; skb = netdev_alloc_skb_ip_align(NULL, ETH_HLEN + hdr_len + tvlv_len);