mbox

pull request: batman-adv 2011-06-09

Message ID 1307653754-5014-1-git-send-email-sven@narfation.org
State Accepted, archived
Delegated to: David Miller
Headers show

Pull-request

git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next

Message

Sven Eckelmann June 9, 2011, 9:09 p.m. UTC
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

Comments

David Miller June 9, 2011, 9:58 p.m. UTC | #1
From: Sven Eckelmann <sven@narfation.org>
Date: Thu,  9 Jun 2011 23:09:08 +0200

> 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.

Pulled, thanks Sven.
--
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