From patchwork Sun Apr 17 19:30:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 91572 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 1D1F2B6F0B for ; Mon, 18 Apr 2011 05:36:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753489Ab1DQTgg (ORCPT ); Sun, 17 Apr 2011 15:36:36 -0400 Received: from narfation.org ([79.140.41.39]:49942 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752912Ab1DQTgf (ORCPT ); Sun, 17 Apr 2011 15:36:35 -0400 Received: from sven-desktop.home.narfation.org (i59F6C7AC.versanet.de [89.246.199.172]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id A7B22940D8; Sun, 17 Apr 2011 21:30:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1303068625; bh=LGHP5Wv+T3P4xZwthxVKqOIziaXNLtV7rbDcPQ19fm8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding; b=qSnzXqNarX5Il94gfrwIPZ3IJcPIwGhQMM6aWG1IPHNj6cuWZjC4J13iyXMLC0xTP tvpgvbLI7lkUjgdwF7LekFP3Hkx5V2CaQP7gUUtzP3vQJ78ioFFvwC21PBPSVRt5ZZ u+845i/MFfrd1PtoWXZSAIIeL58IgmY0onhKt1Nc= 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-04-17 Date: Sun, 17 Apr 2011 21:30:10 +0200 Message-Id: <1303068618-27928-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.4.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, I would like to propose following patches for net-next-2.6/2.6.40. Most of the stuff is cleanup work to reduce the locking complexity. The only exception is Andrew Lunn's patch, which only adds the initialisation of tx_queue_len. thanks, Sven The following changes since commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d: Linux 2.6.39-rc1 (2011-03-29 12:09:47 -0700) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Andrew Lunn (1): batman-adv: Set the txqueuelen to zero when creating soft interface Linus Lüssing (5): batman-adv: Move bonding / iface alternating router search to own functions batman-adv: Make gateway_get_selected type safe batman-adv: Simplify gw_check_election(), use gw_get_selected() batman-adv: Make orig_node->router an rcu protected pointer batman-adv: Protect global TQ window with a spinlock Marek Lindner (1): batman-adv: concentrate all curr_gw related rcu operations in select/deselect functions Simon Wunderlich (1): batman-adv: protect softif_neigh by rcu net/batman-adv/gateway_client.c | 259 ++++++++++++++++----------- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/icmp_socket.c | 18 +-- net/batman-adv/originator.c | 38 +++- net/batman-adv/originator.h | 1 + net/batman-adv/routing.c | 378 +++++++++++++++++++++------------------ net/batman-adv/send.c | 19 ++- net/batman-adv/soft-interface.c | 115 +++++++++--- net/batman-adv/types.h | 7 +- net/batman-adv/unicast.c | 2 +- net/batman-adv/vis.c | 91 +++++----- 11 files changed, 537 insertions(+), 393 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