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

login
register
mail settings
Submitter Sven Eckelmann
Date May 1, 2011, 9:10 p.m.
Message ID <1304284234-27338-1-git-send-email-sven@narfation.org>
Download mbox
Permalink /patch/93579/
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 1, 2011, 9:10 p.m.
Hi,

I would like to propose following patches for net-next-2.6/2.6.40. Marek
Lindner continued to convert different datastructures to use RCU. Antonio
Quartulli fixed an important bug introduced in the last patchset related to the
update of the current gateway. He also did some minor cleanup work.

I've removed the patch "net: batman-adv: remove rx_csum ethtool_ops" again
because you already applied it in your branch.

thanks,
	Sven

The following changes since commit af20b710479ae662829cf739b521390daa7fcbcb:

  batman-adv: Set the txqueuelen to zero when creating soft interface (2011-04-17 21:11:02 +0200)

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

Antonio Quartulli (3):
      batman-adv: orig_hash_find() manages rcu_lock/unlock internally
      batman-adv: Move definition of atomic_dec_not_zero() into main.h
      batman-adv: fix gw_node_update() and gw_election()

Marek Lindner (1):
      batman-adv: Make bat_priv->primary_if an rcu protected pointer

 net/batman-adv/aggregation.c       |    1 -
 net/batman-adv/gateway_client.c    |   45 ++++++++++++--------
 net/batman-adv/hard-interface.c    |   83 ++++++++++++++++++++++++-----------
 net/batman-adv/hard-interface.h    |   18 ++++++++
 net/batman-adv/icmp_socket.c       |   19 ++++++--
 net/batman-adv/main.h              |    2 +
 net/batman-adv/originator.c        |   34 +++++++++------
 net/batman-adv/routing.c           |   34 ++++++---------
 net/batman-adv/send.c              |   18 ++++++--
 net/batman-adv/soft-interface.c    |   64 +++++++++++++++++++--------
 net/batman-adv/translation-table.c |   57 ++++++++++++++++++------
 net/batman-adv/types.h             |    2 +-
 net/batman-adv/unicast.c           |   16 +++++--
 net/batman-adv/vis.c               |   37 +++++++++++-----
 14 files changed, 292 insertions(+), 138 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 2, 2011, 10:06 p.m.
From: Sven Eckelmann <sven@narfation.org>
Date: Sun,  1 May 2011 23:10:30 +0200

> I would like to propose following patches for net-next-2.6/2.6.40. Marek
> Lindner continued to convert different datastructures to use RCU. Antonio
> Quartulli fixed an important bug introduced in the last patchset related to the
> update of the current gateway. He also did some minor cleanup work.
> 
> I've removed the patch "net: batman-adv: remove rx_csum ethtool_ops" again
> because you already applied it in your branch.

I'll pull this, but I really want you to resolve atomic_dec_not_zero()
properly.

It does not belong in any batman-adv header file.

Instead it belongs in all of arch/${ARCH}/include/asm/atomic.h and
include/asm-generic/atomic.h

Please submit a patch which puts it in the proper place to linux-kernel

Don't worry about build problems resulting from this, I'll make sure
to deal with it properly when the change shows up in Linus's tree.

Thanks.
--
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
Sven Eckelmann - May 3, 2011, 12:23 p.m.
On Tuesday 03 May 2011 00:06:20 David Miller wrote:
[...]
> I'll pull this, but I really want you to resolve atomic_dec_not_zero()
> properly.
> 
> It does not belong in any batman-adv header file.
> 
> Instead it belongs in all of arch/${ARCH}/include/asm/atomic.h and
> include/asm-generic/atomic.h

I agree.

> Please submit a patch which puts it in the proper place to linux-kernel

Thanks, will do that later - just prepared a patch
 https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-May/004562.html but 
currently have no time to make a final version (maybe in 8 hours) and send it 
to linux-kernel.

Thanks,
	Sven