From patchwork Sat Mar 5 12:28:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 85491 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 E5857B70D0 for ; Sat, 5 Mar 2011 23:29:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248Ab1CEM31 (ORCPT ); Sat, 5 Mar 2011 07:29:27 -0500 Received: from narfation.org ([79.140.41.39]:36245 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750821Ab1CEM3Z (ORCPT ); Sat, 5 Mar 2011 07:29:25 -0500 Received: from sven-desktop.home.narfation.org (i59F6B254.versanet.de [89.246.178.84]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 220369405E; Sat, 5 Mar 2011 13:29:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1299328165; bh=6P8BCQy3qfK/6iBFTACtOTj7nrbR8D7/UssXFDp4cOo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding; b=a0sUUGRjNeUu06h81lLxVTOHWU0h5dwqR+YclZ1gtf/a7BYIuiW12URKYRWTYUuNe dwJOppYYQRarpJDAZYscy5y/1eZx7x1KRLQk7e7RdvCEFjuFTWdtRCrrIpM1qM/gUq ytbTbJRrTSpVq/Cdlr6ncBDdjBxgsL/HdWbJOuwM= From: Sven Eckelmann 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-03-05 Date: Sat, 5 Mar 2011 13:28:14 +0100 Message-Id: <1299328122-21468-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.2.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, I was asked to submit following pull request for net-next-2.6/linux-2.6.39. It contains Marek's hard work (and of course related work by other people) to remove the orig_hash (aka the batman-adv private "big kernel lock"). There are also smaller cleanups by Marek, Jesper Juhl and Linus Luessing which remove some unused variables, includes and irritating naming schemes. thanks, Sven The following changes since commit 3878f1f075470990d9c2418b53f31694e774f743: batman-adv: Disallow originator addressing within mesh layer (2011-02-11 23:30:33 +0100) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Jesper Juhl (1): batman-adv: Remove two duplicate includes. Linus Lüssing (4): batman-adv: Make bat_priv->curr_gw an rcu protected pointer batman-adv: Increase orig_node refcount before releasing rcu read lock batman-adv: Fix possible buffer overflow in softif neigh list output batman-adv: Remove unused hdr_size variable in route_unicast_packet() Marek Lindner (21): batman-adv: protect neighbor nodes with reference counters batman-adv: convert neighbor list to hlist batman-adv: protect neighbor list with rcu locks batman-adv: free neighbors when an interface is deactivated batman-adv: protect neigh_nodes used outside of rcu_locks with refcounting batman-adv: protect each hash row with rcu locks batman-adv: protect originator nodes with reference counters batman-adv: protect ogm counter arrays with spinlock batman-adv: Correct rcu refcounting for neigh_node batman-adv: Correct rcu refcounting for gw_node batman-adv: Correct rcu refcounting for softif_neigh batman-adv: Correct rcu refcounting for batman_if batman-adv: protect bit operations to count OGMs with spinlock batman-adv: make broadcast seqno operations atomic batman-adv: separate ethernet comparing calls from hash functions batman-adv: remove extra layer between hash and hash element - hash bucket batman-adv: Correct rcu refcounting for orig_node batman-adv: increase refcount in create_neighbor to be consistent batman-adv: remove orig_hash spinlock batman-adv: rename global if_list to hardif_list batman-adv: rename batman_if struct to hard_iface Simon Wunderlich (1): batman-adv: protect bonding with rcu locks Sven Eckelmann (1): batman-adv: Disallow regular interface as mesh device net/batman-adv/aggregation.c | 8 +- net/batman-adv/aggregation.h | 4 +- net/batman-adv/bat_sysfs.c | 51 +- net/batman-adv/gateway_client.c | 140 ++++-- net/batman-adv/hard-interface.c | 407 ++++++++-------- net/batman-adv/hard-interface.h | 15 +- net/batman-adv/hash.c | 26 +- net/batman-adv/hash.h | 112 ++--- net/batman-adv/icmp_socket.c | 40 +- net/batman-adv/main.c | 13 +- net/batman-adv/main.h | 12 +- net/batman-adv/originator.c | 252 ++++++---- net/batman-adv/originator.h | 50 ++- net/batman-adv/routing.c | 983 +++++++++++++++++++++--------------- net/batman-adv/routing.h | 25 +- net/batman-adv/send.c | 103 ++-- net/batman-adv/send.h | 8 +- net/batman-adv/soft-interface.c | 74 ++-- net/batman-adv/soft-interface.h | 3 +- net/batman-adv/translation-table.c | 205 +++++--- net/batman-adv/types.h | 48 +- net/batman-adv/unicast.c | 93 ++-- net/batman-adv/unicast.h | 2 +- net/batman-adv/vis.c | 192 ++++--- 24 files changed, 1634 insertions(+), 1232 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