mbox

pull request: batman-adv 2013-01-14

Message ID 1358120480-25960-1-git-send-email-ordex@autistici.org
State Not Applicable, archived
Headers show

Pull-request

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

Message

Antonio Quartulli Jan. 13, 2013, 11:41 p.m. UTC
this is our first changeset intended for net-next/linux-3.9.
In this batch you have mostly code refactoring, style adjustments and output
beautifications.
The only new 'behaviours' are:
- prevent the TT component from learning multicast mac addresses as they are not
  really handled (yet)
- initialise own lockdep class for each hash table in order to avoid false
  positive from lockdep


Please pull or let me know if there is any problem.
Thanks a lot,
	Antonio


The following changes since commit 00494be4546432a11d62ebfeca363256ff9822b5:

  networking/cs89x0.txt: delete stale information about hand patching (2013-01-11 16:52:26 -0800)

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 0c430d0d7b8bafa74959a84156ef0bda1417a3d4:

  batman-adv: unbloat batadv_priv if debug is not enabled (2013-01-12 20:58:23 +1000)

----------------------------------------------------------------
Included changes:
- use per_cpu_add when possible
- prevent the TT component to add multicast address as "mesh clients"
- some debug output improvements
- proper lockdeps class initializations
- new style fixes (space before/after brackets)
- other minor fixes and refactoring

----------------------------------------------------------------
Antonio Quartulli (11):
      batman-adv: reduce local TT entry timeout to 10 minutes
      batman-adv: improve local translation table output
      batman-adv: print the CRC together with the translation tables
      batman-adv: unify and properly print hex values
      batman-adv: remove useless assignment in tt_local_add()
      batman-adv: Initialize lockdep class keys for hashes
      batman-adv: remove useless blank lines before and after brackets
      batman-adv: remove useless NULL check
      batman-adv: don't compile the BLA switch if not requested
      batman-adv: use the const qualifier in hash functions
      batman-adv: fix typo in debug message

Linus L├╝ssing (1):
      batman-adv: Do not add multicast MAC addresses to translation table

Marek Lindner (2):
      batman-adv: remove unused variable from orig_node struct
      batman-adv: unbloat batadv_priv if debug is not enabled

Shan Wei (1):
      batman-adv: use per_cpu_add helper

 net/batman-adv/bat_iv_ogm.c            |  8 +---
 net/batman-adv/bridge_loop_avoidance.c | 24 +++++------
 net/batman-adv/debugfs.c               |  8 +---
 net/batman-adv/hash.h                  |  2 +-
 net/batman-adv/main.h                  |  6 +--
 net/batman-adv/originator.c            |  9 +++--
 net/batman-adv/routing.c               |  4 --
 net/batman-adv/send.c                  |  2 -
 net/batman-adv/soft-interface.c        |  7 +++-
 net/batman-adv/translation-table.c     | 73 ++++++++++++++++++++++------------
 net/batman-adv/types.h                 |  7 +++-
 net/batman-adv/unicast.c               |  2 -
 net/batman-adv/vis.c                   |  6 +++
 13 files changed, 88 insertions(+), 70 deletions(-)

Comments

David Miller Jan. 14, 2013, 1:39 a.m. UTC | #1
From: Antonio Quartulli <ordex@autistici.org>
Date: Mon, 14 Jan 2013 09:41:05 +1000

> this is our first changeset intended for net-next/linux-3.9.
> In this batch you have mostly code refactoring, style adjustments and output
> beautifications.
> The only new 'behaviours' are:
> - prevent the TT component from learning multicast mac addresses as they are not
>   really handled (yet)
> - initialise own lockdep class for each hash table in order to avoid false
>   positive from lockdep
...
>   git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem

Pulled, thanks.
Joe Perches Jan. 14, 2013, 5:36 p.m. UTC | #2
On Mon, 2013-01-14 at 09:41 +1000, Antonio Quartulli wrote:
> diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
[]
> @@ -284,12 +284,16 @@ struct batadv_priv {
>  	atomic_t gw_bandwidth;		/* gw bandwidth */
>  	atomic_t orig_interval;		/* uint */
>  	atomic_t hop_penalty;		/* uint */
> +#ifdef CONFIG_BATMAN_ADV_DEBUG
>  	atomic_t log_level;		/* uint */
> +#endif
>  	atomic_t bcast_seqno;
>  	atomic_t bcast_queue_left;
>  	atomic_t batman_queue_left;
>  	char num_ifaces;
> +#ifdef CONFIG_BATMAN_ADV_DEBUG
>  	struct batadv_debug_log *debug_log;
> +#endif
>  	struct kobject *mesh_obj;
>  	struct dentry *debug_dir;
>  	struct hlist_head forw_bat_list;

How about moving one of these so
there's only one #ifdef block.
Antonio Quartulli Jan. 15, 2013, 8:53 a.m. UTC | #3
Hi Joe,

On Mon, Jan 14, 2013 at 09:36:40 -0800, Joe Perches wrote:
> On Mon, 2013-01-14 at 09:41 +1000, Antonio Quartulli wrote:
> > diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
> []
> > @@ -284,12 +284,16 @@ struct batadv_priv {
> >  	atomic_t gw_bandwidth;		/* gw bandwidth */
> >  	atomic_t orig_interval;		/* uint */
> >  	atomic_t hop_penalty;		/* uint */
> > +#ifdef CONFIG_BATMAN_ADV_DEBUG
> >  	atomic_t log_level;		/* uint */
> > +#endif
> >  	atomic_t bcast_seqno;
> >  	atomic_t bcast_queue_left;
> >  	atomic_t batman_queue_left;
> >  	char num_ifaces;
> > +#ifdef CONFIG_BATMAN_ADV_DEBUG
> >  	struct batadv_debug_log *debug_log;
> > +#endif
> >  	struct kobject *mesh_obj;
> >  	struct dentry *debug_dir;
> >  	struct hlist_head forw_bat_list;
> 
> How about moving one of these so
> there's only one #ifdef block.

Yeah. This is the main struct and actually it still needs some more housekeeping
(and some love).
It was initially sorted in another way, but as soon as we added new features it
lost its shape.

We will take care of that.

Thanks a lot!
Cheers,