From patchwork Thu Sep 22 18:57:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 115999 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 717A7B6F64 for ; Fri, 23 Sep 2011 04:57:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753488Ab1IVS50 (ORCPT ); Thu, 22 Sep 2011 14:57:26 -0400 Received: from nm8.bullet.mail.ukl.yahoo.com ([217.146.182.249]:26282 "HELO nm8.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751370Ab1IVS5Z (ORCPT ); Thu, 22 Sep 2011 14:57:25 -0400 Received: from [217.146.183.217] by nm8.bullet.mail.ukl.yahoo.com with NNFMP; 22 Sep 2011 18:57:24 -0000 Received: from [77.238.184.66] by tm10.bullet.mail.ukl.yahoo.com with NNFMP; 22 Sep 2011 18:57:24 -0000 Received: from [127.0.0.1] by smtp135.mail.ukl.yahoo.com with NNFMP; 22 Sep 2011 18:57:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1316717844; bh=oMcDvKUNOihcNKBOk/d+ZD38Eb73Xzp/qv+xbiHo300=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=X/ZEu9slSPf+NopEcYKQ+YmL5FKGNk+zih/etk78bt0PzfqTyxMc4fJzDRSVyUEXLd+3RSYFJ7Y3UKR6Jpb0DYoG++2ENEOnUlcrkPcHNuwkkkVjNXYQr3BGeY1Lr+72kMDoiiQnusqgVLJg/HHdYzAyieOxOhuniiOlYmndjpo= X-Yahoo-Newman-Id: 523081.23721.bm@smtp135.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: a1sH1VgVM1nRlNnjiEOHvrb8qqVPk9fV1pL9QYqJLqW3bVZ DlocWW8Tj.OeHf0c8v2kXpQqajazlTrANaidKn.Jpvf8yp6DAPE_JhDTKPOq YIQzG.6VJ8uOaO0rrN2TvIRunGHl4P2.Ig2xal6JvTHnMKSTS8BJxmH0yHLa kYOTwCrhaetGYv51dxNNTgZwRM9lCvck..tpPZBs7ScuijaDby2oeDmW3s2r nCT0UMCanSyvIrX3uIbm1kXcLkxeO46zLlC1JdpslUSOGQ_65yZlHvM7qDpr GrNJPCC91FPEHuyqITTpwGvZHTXwScbJWfZq_LcIoVYv8Sxh1DO1GgQOfIC1 FGmWnYfz3XiDitzKBVKzi.AbIcC03dOxZlQ5vK_yX6pFHTVA7Wz6dVAwOFJw qcFYNNTxu5tDGWvc2bDNgzC3SHDiq9gR.kcJqr9uoGi6izAwf.XgToTaf3kS BQ5Y.hqUJ.DC2i24- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@78.46.248.235 with plain) by smtp135.mail.ukl.yahoo.com with SMTP; 22 Sep 2011 18:57:23 +0000 GMT From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: pull request: batman-adv 2011-09-22 (regression fix) Date: Thu, 22 Sep 2011 20:57:15 +0200 Message-Id: <1316717836-19374-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi David, our testers have discovered a regression in the current linux-3.1 code base. It increases latency of payload traffic by a factor of 4-5. Therefore we propose a patch that hopefully can be included before linux 3.1 final has been released. We kept it as short as possible to avoid introducing last minute bugs. Once you pulled the patch you will run into a merge conflict with net-next: ++<<<<<<< HEAD + orig_node = transtable_search(bat_priv, ethhdr->h_source, + ethhdr->h_dest); + if (is_multicast_ether_addr(ethhdr->h_dest) || + (orig_node && orig_node->gw_flags)) { ++======= + orig_node = transtable_search(bat_priv, ethhdr->h_dest); + do_bcast = is_multicast_ether_addr(ethhdr->h_dest); + if (do_bcast || (orig_node && orig_node->gw_flags)) { ++>>>>>>> batman-adv/maint The correct merge result would be: +====== orig_node = transtable_search(bat_priv, ethhdr->h_source, ethhdr->h_dest); do_bcast = is_multicast_ether_addr(ethhdr->h_dest); if (do_bcast || (orig_node && orig_node->gw_flags)) { +====== Let me know if there is a better way to address the merge conflict. Thanks, Marek The following changes since commit 322a8b034003c0d46d39af85bf24fee27b902f48: Linux 3.1-rc1 (2011-08-07 18:23:30 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/maint Antonio Quartulli (1): batman-adv: do_bcast has to be true for broadcast packets only net/batman-adv/soft-interface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html