pull request: batman-adv 2012-06-25

Hello David,

this is another set of changes intended for net-next/linux-3.6.

This patchset is entirely composed by "namespace renaming" patches.

Please, let me know if there is any problem.

Thank you,
	Antonio




The following changes since commit 7011d0851b80a1a229acfda37ce08aad903b12d1:

  tcp: Fix bug in tcp socket early demux (2012-06-23 23:22:38 -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 a513088d022c8f59cebe17c567797c220563b517:

  batman-adv: Prefix translation-table local static functions with batadv_ (2012-06-25 08:21:50 +0200)

----------------------------------------------------------------
Included changes:
- yet another batch of 'namespace cleaning' patches

----------------------------------------------------------------
Sven Eckelmann (20):
      batman-adv: Prefix bat_debugfs local static functions with batadv_
      batman-adv: Prefix bitarray static inline functions with batadv_
      batman-adv: Prefix hard-interface static inline functions with batadv_
      batman-adv: Prefix hash static inline functions with batadv_
      batman-adv: Prefix originator static inline functions with batadv_
      batman-adv: Prefix unicast static inline functions with batadv_
      batman-adv: Prefix main static inline functions with batadv_
      batman-adv: Prefix bat_iv_ogm local static functions with batadv_
      batman-adv: Prefix bat_sysfs local static functions with batadv_
      batman-adv: Prefix bridge_loop_avoidance local static functions with batadv_
      batman-adv: Prefix gateway_client local static functions with batadv_
      batman-adv: Prefix gateway_common local static functions with batadv_
      batman-adv: Prefix hard-interface local static functions with batadv_
      batman-adv: Prefix hash local static functions with batadv_
      batman-adv: Prefix icmp_socket local static functions with batadv_
      batman-adv: Prefix originator local static functions with batadv_
      batman-adv: Prefix routing local static functions with batadv_
      batman-adv: Prefix send local static functions with batadv_
      batman-adv: Prefix soft-interface local static functions with batadv_
      batman-adv: Prefix translation-table local static functions with batadv_

 net/batman-adv/bat_debugfs.c           |  143 +++---
 net/batman-adv/bat_iv_ogm.c            |  490 +++++++++++----------
 net/batman-adv/bat_sysfs.c             |  277 ++++++------
 net/batman-adv/bitarray.c              |   18 +-
 net/batman-adv/bitarray.h              |    6 +-
 net/batman-adv/bridge_loop_avoidance.c |  518 +++++++++++-----------
 net/batman-adv/gateway_client.c        |  125 +++---
 net/batman-adv/gateway_common.c        |   10 +-
 net/batman-adv/hard-interface.c        |   96 +++--
 net/batman-adv/hard-interface.h        |    7 +-
 net/batman-adv/hash.c                  |    4 +-
 net/batman-adv/hash.h                  |   19 +-
 net/batman-adv/icmp_socket.c           |   84 ++--
 net/batman-adv/main.c                  |    8 +-
 net/batman-adv/main.h                  |   17 +-
 net/batman-adv/originator.c            |  128 +++---
 net/batman-adv/originator.h            |   10 +-
 net/batman-adv/routing.c               |  174 ++++----
 net/batman-adv/send.c                  |   48 +--
 net/batman-adv/soft-interface.c        |   86 ++--
 net/batman-adv/translation-table.c     |  742 +++++++++++++++++---------------
 net/batman-adv/unicast.c               |    6 +-
 net/batman-adv/unicast.h               |    2 +-
 net/batman-adv/vis.c                   |   53 +--
 24 files changed, 1591 insertions(+), 1480 deletions(-)

From: Antonio Quartulli <ordex@autistici.org>
Date: Mon, 25 Jun 2012 08:54:24 +0200

> this is another set of changes intended for net-next/linux-3.6.
> 
> This patchset is entirely composed by "namespace renaming" patches.
> 
> Please, let me know if there is any problem.

Pulled, but you really, _REALLY_, should have let me pull 'net'
into 'net-next' to resolve the conflicts in translation-table.c
before sending this work to me.

I did that merge before getting to this pull request and did my
best merging things together.

But I know I made mistakes, so please send me whatever fixups
are necessary.

Thanks.

Hello David,

here are our two fixes to recover from the little problems introduced during the
last conflict resolution involving translation-table.c.
Sorry for the inconvenient.

Thank you,
	Antonio

From: Antonio Quartulli <ordex@autistici.org>
Date: Tue, 26 Jun 2012 08:49:49 +0200

> here are our two fixes to recover from the little problems introduced during the
> last conflict resolution involving translation-table.c.
> Sorry for the inconvenient.

Both applied, thanks.