From patchwork Wed Apr 17 21:03:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 237363 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 1B0042C010D for ; Thu, 18 Apr 2013 07:05:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966574Ab3DQVFU (ORCPT ); Wed, 17 Apr 2013 17:05:20 -0400 Received: from contumacia.investici.org ([178.255.144.35]:22475 "EHLO contumacia.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755527Ab3DQVFT (ORCPT ); Wed, 17 Apr 2013 17:05:19 -0400 Received: from [178.255.144.35] (contumacia [178.255.144.35]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 054E3E8A35; Wed, 17 Apr 2013 21:05:15 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 contumacia.investici.org 054E3E8A35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1366232716; bh=BSTq8f8bWexRTNVg5lrWJF1VjiHkgHuBYCAOAdJ9qvs=; h=From:To:Cc:Subject:Date:Message-Id; b=mCIqzcee4KZXic2pp3JQKPLYzKVxb0qS4wkiaJbU88DtvEczueSGg1iBvp2O6sxHi JEgDdtO8JDuh36Dd/Urwin+kYS4T896mV6ug46aDpU+qiCyLyZC5VGrdsohxuoMxua tYnoIAwGvLSB6UkcARC6FewJDTxFOZl1Y0QXwFXA= From: Antonio Quartulli To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: pull request: batman-adv 2013-04-17 Date: Wed, 17 Apr 2013 23:03:15 +0200 Message-Id: <1366232596-23172-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.8.1.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi David, here you have a patch intended for net/linux-3.9 (if it can still make it..). It is fixing a MAC address check routine which does not behave correctly in case of multiple mesh interfaces in the same node. This patch will generate some conflicts the next time you will merge net in net-next and will also break it (this happens because the function this patch is changing is used by some patches existing in net-next only). I will send some instruction on how to solve the merge conflicts and a patch to fix net-next soon. Please pull or let me know if there is any problem. Thanks a lot, Antonio The following changes since commit 361cd29cf9363505c2a35bbf9a034a22feebfb07: qlcnic: fix beaconing test for 82xx adapter (2013-04-17 01:15:29 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to fe8a93b95145c66adf196eea4a919dfe0b7c57db: batman-adv: make is_my_mac() check for the current mesh only (2013-04-17 22:31:22 +0200) ---------------------------------------------------------------- Included changes: - fix MAC address check in case of multiple mesh interfaces ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: make is_my_mac() check for the current mesh only net/batman-adv/main.c | 5 ++++- net/batman-adv/main.h | 2 +- net/batman-adv/routing.c | 38 ++++++++++++++++++++------------------ net/batman-adv/translation-table.c | 2 +- net/batman-adv/vis.c | 4 ++-- 5 files changed, 28 insertions(+), 23 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