From patchwork Sat Apr 7 18:49:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 151314 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 1033CB709F for ; Sun, 8 Apr 2012 04:49:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753549Ab2DGStN (ORCPT ); Sat, 7 Apr 2012 14:49:13 -0400 Received: from investici.nine.ch ([217.150.252.179]:60747 "EHLO confino.investici.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463Ab2DGStM (ORCPT ); Sat, 7 Apr 2012 14:49:12 -0400 Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 3F2F5C865C; Sat, 7 Apr 2012 18:49:07 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org 3F2F5C865C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1333824549; bh=696bEj7hm4FpVIbY4j830YoxPisbuDSvrKsQEb0An48=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding; b=fadhOroA9zIKOKyNkFhw25rp6hJjT+38me+vwWYT3z+Noiw4Zs6LJ7aE58X52ocB1 rSLH6HoZlUWh5/CFBqb7/QQW+XVsdW6fwNctZ0lHM/sai8+0/Rxp8yXTSJcNl/Smb7 gHhgOiBkm1pJ2wQ+ejflgiZxJ1apn5PZ/JZo80i8= 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 2012-04-07 Date: Sat, 7 Apr 2012 20:49:42 +0200 Message-Id: <1333824598-27771-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.9.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello, this is the updated and cleaned up version of our last pull request (sent on 2012-04-05). In this patchset I fixed the two problems you told me about (comments ending with */ not on a newline and usage of "func(...)" instead of static inline ones). In patch 14 I also changed the type of "stp_addr[ETH_ALEN]" from "uint8_t" to "static const uint8_t" (as suggested by Bernd Petrovitsch). Thank you, Antonio The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 369a2792da3265eae09cf10e09bcaf95ceb521e5: batman-adv: add bridge loop avoidance compile option (2012-04-07 12:54:52 +0200) ---------------------------------------------------------------- Included changes: * add my name to the maintainers list of batman-adv * some clean up fixes * increases the default hop-penalty in order to encourage the routing protocol   to choose shorter routes * renew the bridge loop avoidance mechanism The latter mechanism was already present in batman-adv but recently the concept has been discussed again and here comes the new implementation. Moreover we added a compile option in order to let expert people, which think that this mechanism is not helpful at all, disable it and save some space. ---------------------------------------------------------------- Antonio Quartulli (3): MAINTAINERS: add additional maintainer for net/batman-adv batman-adv: clean up Kconfig batman-adv: use ETH_ALEN instead of hardcoded numeric constants Marek Lindner (1): batman-adv: encourage batman to take shorter routes by changing the default hop penalty Simon Wunderlich (10): batman-adv: remove old bridge loop avoidance code batman-adv: add basic bridge loop avoidance code batman-adv: make bridge loop avoidance switchable batman-adv: export claim tables through debugfs batman-adv: allow multiple entries in tt_global_entries batman-adv: don't let backbone gateways exchange tt entries batman-adv: add broadcast duplicate check batman-adv: drop STP over batman batman-adv: form groups in the bridge loop avoidance batman-adv: add bridge loop avoidance compile option Sven Eckelmann (2): batman-adv: Replace bitarray operations with bitmap batman-adv: Remove declaration of only locally used functions Documentation/ABI/testing/sysfs-class-net-mesh | 9 + Documentation/networking/batman-adv.txt | 19 +- MAINTAINERS | 1 + net/batman-adv/Kconfig | 27 +- net/batman-adv/Makefile | 1 + net/batman-adv/bat_debugfs.c | 19 +- net/batman-adv/bat_iv_ogm.c | 15 +- net/batman-adv/bat_sysfs.c | 8 +- net/batman-adv/bitarray.c | 118 +- net/batman-adv/bitarray.h | 26 +- net/batman-adv/bridge_loop_avoidance.c | 1583 ++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 98 ++ net/batman-adv/hard-interface.c | 18 +- net/batman-adv/main.c | 9 +- net/batman-adv/main.h | 11 +- net/batman-adv/originator.c | 3 +- net/batman-adv/packet.h | 43 +- net/batman-adv/routing.c | 29 +- net/batman-adv/routing.h | 1 - net/batman-adv/soft-interface.c | 498 +------- net/batman-adv/soft-interface.h | 2 - net/batman-adv/translation-table.c | 435 +++++-- net/batman-adv/translation-table.h | 8 - net/batman-adv/types.h | 77 +- 24 files changed, 2263 insertions(+), 795 deletions(-) create mode 100644 net/batman-adv/bridge_loop_avoidance.c create mode 100644 net/batman-adv/bridge_loop_avoidance.h --- 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