Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
commit 7ace0eb8277cedde2bd0f1d0499ed84de63c758a Merge: 9d48399 9729d20 Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu May 15 04:43:37 2014 +0800
Merge branch 'maint' into next
Conflicts: translation-table.c
7ace0eb8277cedde2bd0f1d0499ed84de63c758a soft-interface.c | 60 +++++++++++++++++++++++++++++++++++++++------------ translation-table.c | 26 ++++++++++++++++++++++ types.h | 2 ++ 3 files changed, 74 insertions(+), 14 deletions(-)
diff --cc translation-table.c index d636bde,b689981..5f59e7f --- a/translation-table.c +++ b/translation-table.c @@@ -510,7 -484,8 +510,8 @@@ bool batadv_tt_local_add(struct net_dev { struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_tt_local_entry *tt_local; - struct batadv_tt_global_entry *tt_global; + struct batadv_tt_global_entry *tt_global = NULL; + struct batadv_softif_vlan *vlan; struct net_device *in_dev = NULL; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry;