From patchwork Thu Jun 9 21:09:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 99810 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 8E8B9B7009 for ; Fri, 10 Jun 2011 07:09:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756012Ab1FIVJT (ORCPT ); Thu, 9 Jun 2011 17:09:19 -0400 Received: from narfation.org ([79.140.41.39]:56871 "EHLO v3-1039.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753536Ab1FIVJS (ORCPT ); Thu, 9 Jun 2011 17:09:18 -0400 Received: from sven-desktop.home.narfation.org (i59F6B148.versanet.de [89.246.177.72]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 19B27940F2; Thu, 9 Jun 2011 23:09:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1307653786; bh=VX7I3+SQc+P+mltrcfbTlzjhmhxxL16HK42Q3ba+pD8=; h=From:To:Cc:Subject:Date:Message-Id; b=Siw2bxq0qTpOfgwH+VQSoMWNfA0NuwmyvRhmSDarZ1f61yGyNp5PaTq1RP09Koka/ FO+W2NORVpPTvZW+eRF6VdxAVVmef4T0ZcznqnCKMfWq8A2C98fgckeBDqmFg3CzCu b2HckadK0GxKxN7O2ZSDqd4dp+xfw8ghdm/szRnM= 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-06-09 Date: Thu, 9 Jun 2011 23:09:08 +0200 Message-Id: <1307653754-5014-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.5.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, I would like to propose following changes for net-next-2.6/3.1. Most patches are simple cleanup patches and only Daniele Furlan provided an enhancement which should fix some routing decisions when a mesh node is overloaded and OGMs get delayed. Thanks, Sven The following changes since commit bb899b89f46eb1fd6f62a4c360f6511b9714e479: batman-adv: Ensure that we really have route changes in update_route (2011-05-30 07:39:37 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Daniele Furlan (1): batman-adv: accept delayed rebroadcasts to avoid bogus routing under heavy load Marek Lindner (1): batman-adv: use NO_FLAGS define instead of hard-coding 0 Sven Eckelmann (4): batman-adv: Don't return value in void function batman-adv: Fix signedness problem in parse_gw_bandwidth batman-adv: Rewrite debugfs kobj_to_* helpers as functions batman-adv: Use enums for related constants net/batman-adv/aggregation.c | 2 +- net/batman-adv/bat_sysfs.c | 14 +++++++++-- net/batman-adv/gateway_client.c | 6 ++-- net/batman-adv/gateway_common.c | 4 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 14 ++++++----- net/batman-adv/main.h | 19 ++++++++++----- net/batman-adv/packet.h | 47 ++++++++++++++++++++++++--------------- net/batman-adv/routing.c | 9 +++---- net/batman-adv/send.c | 2 +- 10 files changed, 72 insertions(+), 47 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