mbox

pull request: batman-adv 2012-06-18

Message ID 1340051963-14836-1-git-send-email-ordex@autistici.org (mailing list archive)
State Not Applicable, archived
Headers

Pull-request

git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem

Message

Antonio Quartulli June 18, 2012, 8:39 p.m. UTC
  Hello David,
	here is our first set of changes intended for next-next/linux-3.6.

Patch 2 fixes a major bug in the TranslationTable code where the old value of
skb->data is used for memory access even if the data was relocated.
Patches 4, 10, 11, 13, 14 are endianess-related cleanups that we wrote thanks
to Al Viro's advice and help.
Thanks to Martin Hundebøll batman-adv now supports the ethtool API and can
export several counters that are specific to our module (patch 5).
Then patch 16 improves the routing protocol API by making part of the
TranslationTable code routing agnostic.
The rest are minor fixes and other cleanups.

Thank you very much,
		Antonio



The following changes since commit 6fac262526ee91ee66210b8919a4297dcf7d544e:

  ipv4: Cap ADVMSS metric in the FIB rather than the routing cache. (2012-06-17 19:47:34 -0700)

are available in the git repository at:

  git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem

for you to fetch changes up to dafe94b278e052c3901b137fe6f666f8f92d839a:

  batman-adv: only store changed gw_bandwidth values (2012-06-18 18:01:07 +0200)

----------------------------------------------------------------
Included changes:

* major skb->data pointer usage fix
* interval version update
* added get_ethtool_stats() support
* endianess clean up
* routing protocol API improvement wrt TT commit code
* fix locking in hash table code
* minor cleanups and fixes

----------------------------------------------------------------
Al Viro (5):
      batman-adv: get rid of pointless cast in memcpy()
      batman-adv: trivial endianness annotations
      batman-adv: keep batman_ogm_packet ->seqno net-endian all along
      batman-adv: don't bother flipping ->tt_data
      batman-adv: don't bother flipping ->tt_crc

Antonio Quartulli (3):
      batman-adv: fix skb->data assignment
      batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_t
      batman-adv: use DBG_ALL in log_level sysfs definition

Marek Lindner (5):
      batman-adv: avoid characters requiring shell escapes in protocol names
      batman-adv: ignore trailing CR when comparing protocol names
      batman-adv: return added entries instead of number of possibly added entries
      batman-adv: turn tt commit code into routing protocol agnostic API
      batman-adv: only store changed gw_bandwidth values

Martin Hundebøll (1):
      batman-adv: Add get_ethtool_stats() support

Matthias Schiffer (2):
      batman-adv: fix visualization output without neighbors on the primary interface
      batman-adv: fix locking in hash_add()

Sven Eckelmann (3):
      batman-adv: update internal version number
      batman-adv: Initialize lockdep class keys for hashes
      batman-adv: Return error codes instead of -1 on failures

 Documentation/networking/batman-adv.txt |    5 +
 net/batman-adv/bat_debugfs.c            |   11 +-
 net/batman-adv/bat_iv_ogm.c             |   63 ++++++------
 net/batman-adv/bat_sysfs.c              |    4 +-
 net/batman-adv/bridge_loop_avoidance.c  |   27 +++--
 net/batman-adv/gateway_common.c         |    3 +
 net/batman-adv/hard-interface.c         |    4 +-
 net/batman-adv/hash.c                   |    9 ++
 net/batman-adv/hash.h                   |   19 ++--
 net/batman-adv/icmp_socket.c            |    4 +-
 net/batman-adv/main.c                   |   42 +++++---
 net/batman-adv/main.h                   |   29 +++++-
 net/batman-adv/originator.c             |   18 ++--
 net/batman-adv/packet.h                 |   18 ++--
 net/batman-adv/routing.c                |   23 +++--
 net/batman-adv/send.c                   |   74 +-------------
 net/batman-adv/soft-interface.c         |   66 +++++++++++-
 net/batman-adv/translation-table.c      |  168 ++++++++++++++++++++++++-------
 net/batman-adv/translation-table.h      |    7 +-
 net/batman-adv/types.h                  |   22 +++-
 net/batman-adv/vis.c                    |   29 ++++--
 21 files changed, 420 insertions(+), 225 deletions(-)
  

Comments

David Miller June 19, 2012, 3:28 a.m. UTC | #1
From: Antonio Quartulli <ordex@autistici.org>
Date: Mon, 18 Jun 2012 22:39:04 +0200

> Hello David,
> 	here is our first set of changes intended for next-next/linux-3.6.
> 
> Patch 2 fixes a major bug in the TranslationTable code where the old value of
> skb->data is used for memory access even if the data was relocated.
> Patches 4, 10, 11, 13, 14 are endianess-related cleanups that we wrote thanks
> to Al Viro's advice and help.
> Thanks to Martin Hundebøll batman-adv now supports the ethtool API and can
> export several counters that are specific to our module (patch 5).
> Then patch 16 improves the routing protocol API by making part of the
> TranslationTable code routing agnostic.
> The rest are minor fixes and other cleanups.

Pulled, thanks.