From patchwork Sun May 1 21:10:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 93579 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 9242AB6EE9 for ; Mon, 2 May 2011 07:11:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752434Ab1EAVLM (ORCPT ); Sun, 1 May 2011 17:11:12 -0400 Received: from narfation.org ([79.140.41.39]:40381 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753993Ab1EAVLH (ORCPT ); Sun, 1 May 2011 17:11:07 -0400 Received: from sven-desktop.home.narfation.org (i59F6B197.versanet.de [89.246.177.151]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 24457940CF; Sun, 1 May 2011 23:11:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1304284277; bh=ElrMGGMymDBATxipyk1qMDkfvbPLK5KdszROFviZPAw=; h=From:To:Cc:Subject:Date:Message-Id; b=AYQWOq/0F4TRiyjudvBFQ68BBkWeus3cIiCLIigZvGROkLwJoW9TEWt4aH6dFl9U8 IJ6RW9bRuVvQM3K6m1enbWIvxAE0KqpQ6NO3fTeene3u3Zio9O9ve3bh4aUZ2ewui2 eI6QbdpjFFAdXPw32VAkYb4sVMOjSfcf3ouMyG9k= 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-05-01 Date: Sun, 1 May 2011 23:10:30 +0200 Message-Id: <1304284234-27338-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.4.4 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. Marek Lindner continued to convert different datastructures to use RCU. Antonio Quartulli fixed an important bug introduced in the last patchset related to the update of the current gateway. He also did some minor cleanup work. I've removed the patch "net: batman-adv: remove rx_csum ethtool_ops" again because you already applied it in your branch. thanks, Sven The following changes since commit af20b710479ae662829cf739b521390daa7fcbcb: batman-adv: Set the txqueuelen to zero when creating soft interface (2011-04-17 21:11:02 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Antonio Quartulli (3): batman-adv: orig_hash_find() manages rcu_lock/unlock internally batman-adv: Move definition of atomic_dec_not_zero() into main.h batman-adv: fix gw_node_update() and gw_election() Marek Lindner (1): batman-adv: Make bat_priv->primary_if an rcu protected pointer net/batman-adv/aggregation.c | 1 - net/batman-adv/gateway_client.c | 45 ++++++++++++-------- net/batman-adv/hard-interface.c | 83 ++++++++++++++++++++++++----------- net/batman-adv/hard-interface.h | 18 ++++++++ net/batman-adv/icmp_socket.c | 19 ++++++-- net/batman-adv/main.h | 2 + net/batman-adv/originator.c | 34 +++++++++------ net/batman-adv/routing.c | 34 ++++++--------- net/batman-adv/send.c | 18 ++++++-- net/batman-adv/soft-interface.c | 64 +++++++++++++++++++-------- net/batman-adv/translation-table.c | 57 ++++++++++++++++++------ net/batman-adv/types.h | 2 +- net/batman-adv/unicast.c | 16 +++++-- net/batman-adv/vis.c | 37 +++++++++++----- 14 files changed, 292 insertions(+), 138 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