mbox

pull request: batman-adv 2011-07-05

Message ID 1309873440-11704-1-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Not Applicable, archived
Headers

Pull-request

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

Message

Marek Lindner July 5, 2011, 1:43 p.m. UTC 
  Hi,
   
I'd like to get the following patches pulled into net-next-2.6/3.1.          
This patchset contains a mix of cleanup code (patch 1-3) for the protocol
changes we sent you with our last pull request, 2 bug fixes and an
improved version handling patch.

Thanks,
Marek

PS: This is my first pull request - have mercy on my soul and let me know
if does not meet your expectations.

The following changes since commit 43676ab590c3f8686fd047d34c3e33803eef71f0:

  batman-adv: improved gateway tq-based selection (2011-06-20 11:37:41 +0200)

are available in the git repository at:
  git://git.open-mesh.org/linux-merge.git batman-adv/next

Antonio Quartulli (3):
      batman-adv: unify flags for tt_change/tt_local_entry/tt_global_entry
      batman-adv: add_bcast_packet_to_list() takes the sending delay as parameter
      batman-adv: pass a unique flag arg instead of a sequence of bool ones

Marek Lindner (2):
      batman-adv: broadcast primary OGM on all active hard-interfaces
      batman-adv: aggregation checks should use the primary_if pointer

Sven Eckelmann (1):
      batman-adv: Replace version info instead of appending them

 net/batman-adv/aggregation.c       |   25 ++++++++++++++++++++-----
 net/batman-adv/gateway_client.c    |    5 ++---
 net/batman-adv/main.c              |    9 ++-------
 net/batman-adv/main.h              |   11 +++--------
 net/batman-adv/originator.c        |    5 ++---
 net/batman-adv/packet.h            |   11 +++++++----
 net/batman-adv/routing.c           |    2 +-
 net/batman-adv/send.c              |   21 +++++++++++++++------
 net/batman-adv/send.h              |    2 +-
 net/batman-adv/soft-interface.c    |    2 +-
 net/batman-adv/translation-table.c |   30 ++++++++++++++----------------
 net/batman-adv/translation-table.h |    3 +--
 net/batman-adv/types.h             |    4 ++--
 13 files changed, 71 insertions(+), 59 deletions(-)

Comments

David Miller July 6, 2011, 2:46 a.m. UTC | #1 
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Tue,  5 Jul 2011 15:43:54 +0200

> The following changes since commit 43676ab590c3f8686fd047d34c3e33803eef71f0:
> 
>   batman-adv: improved gateway tq-based selection (2011-06-20 11:37:41 +0200)
> 
> are available in the git repository at:
>   git://git.open-mesh.org/linux-merge.git batman-adv/next

Pulled, thanks.