Patchwork pull request: batman-adv 2011-05-08

login
register
mail settings
Submitter Sven Eckelmann
Date May 8, 2011, 3:24 p.m.
Message ID <1304868284-9364-1-git-send-email-sven@narfation.org>
Download mbox
Permalink /patch/94556/
State Accepted
Delegated to: David Miller
Headers show

Pull-request

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

Comments

Sven Eckelmann - May 8, 2011, 3:24 p.m.
Hi,

I would like to propose following patches for net-next-2.6/2.6.40. They
include minor cleanups of comments, a big rename patch s/hna/tt/, but
also a remove some duplicated code. The spinlock which protected the
list of possible interfaces for batman-adv was completely replaced by
rtnl_lock because we want to be in sync with the rest of the network
stack and the extra spinlock made everything more complex without giving
any additional feature (and rtnl_lock was already used everywhere).
Related to this patch is also a fix which should prevent a deadlock
between the sysfs code and the event listener. Also the reference
counting in find_router was fixed when an error was detected after the
refcounter was already increased. The only feature is the support for
multiple vlans in the bridge loop detection code.

I will submit a patch to remove the atomic_dec_not_zero from main.h
after Linus accepted the patch you already saw.

thanks,
	Sven


The following changes since commit 32ae9b221e788413ce68feaae2ca39e406211a0a:

  batman-adv: Make bat_priv->primary_if an rcu protected pointer (2011-05-01 22:49:03 +0200)

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

Antonio Quartulli (1):
      batman-adv: rename everything from *hna* into *tt* (translation table)

Daniele Furlan (1):
      batman-adv: remove duplicate code from function is_bidirectional_neigh()

Marek Lindner (3):
      batman-adv: remove misplaced comment
      batman-adv: multi vlan support for bridge loop detection
      batman-adv: Fix refcount imbalance in find_router

Sven Eckelmann (3):
      batman-adv: Remove unnecessary hardif_list_lock
      batman-adv: Avoid deadlock between rtnl_lock and s_active
      batman-adv: Remove multiline comments from line ending

 Documentation/networking/batman-adv.txt |   11 +-
 net/batman-adv/aggregation.c            |   16 +-
 net/batman-adv/aggregation.h            |    4 +-
 net/batman-adv/bat_debugfs.c            |    4 +-
 net/batman-adv/bat_sysfs.c              |   16 +-
 net/batman-adv/hard-interface.c         |   36 +--
 net/batman-adv/main.c                   |   20 +-
 net/batman-adv/main.h                   |   42 ++--
 net/batman-adv/originator.c             |   10 +-
 net/batman-adv/packet.h                 |    5 +-
 net/batman-adv/routing.c                |  162 ++++++-------
 net/batman-adv/routing.h                |    6 +-
 net/batman-adv/send.c                   |   16 +-
 net/batman-adv/send.h                   |    2 +-
 net/batman-adv/soft-interface.c         |  409 +++++++++++++++++++++---------
 net/batman-adv/translation-table.c      |  417 ++++++++++++++++---------------
 net/batman-adv/translation-table.h      |   24 +-
 net/batman-adv/types.h                  |   49 +++--
 net/batman-adv/unicast.c                |    2 +-
 net/batman-adv/vis.c                    |   18 +-
 20 files changed, 712 insertions(+), 557 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
David Miller - May 8, 2011, 10:40 p.m.
From: Sven Eckelmann <sven@narfation.org>
Date: Sun,  8 May 2011 17:24:36 +0200

> Hi,
> 
> I would like to propose following patches for net-next-2.6/2.6.40. They
> include minor cleanups of comments, a big rename patch s/hna/tt/, but
> also a remove some duplicated code. The spinlock which protected the
> list of possible interfaces for batman-adv was completely replaced by
> rtnl_lock because we want to be in sync with the rest of the network
> stack and the extra spinlock made everything more complex without giving
> any additional feature (and rtnl_lock was already used everywhere).
> Related to this patch is also a fix which should prevent a deadlock
> between the sysfs code and the event listener. Also the reference
> counting in find_router was fixed when an error was detected after the
> refcounter was already increased. The only feature is the support for
> multiple vlans in the bridge loop detection code.
> 
> I will submit a patch to remove the atomic_dec_not_zero from main.h
> after Linus accepted the patch you already saw.

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