The following commit has been merged in the merge/master branch: commit 817b244043be34c1f1d334befa36c327d42b97ec Merge: 6d9f6164a6e3c55d0902f32a13c8735317bc535f 16d21dc13ee849267206e37c39df14977d476254 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat Aug 8 00:48:47 2015 +0800

Merge branch 'next'

diff --combined net/batman-adv/hard-interface.c index 608ea4a,0565b20..b7146ac --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -528,6 -528,8 +528,8 @@@ void batadv_hardif_disable_interface(st batadv_purge_outstanding_packets(bat_priv, hard_iface); dev_put(hard_iface->soft_iface);

+ netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface); + /* nobody uses this interface anymore */ if (!bat_priv->num_ifaces) { batadv_gw_check_client_stop(bat_priv); @@@ -536,7 -538,6 +538,6 @@@ batadv_softif_destroy_sysfs(hard_iface->soft_iface); }

- netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface); hard_iface->soft_iface = NULL; batadv_hardif_free_ref(hard_iface);

@@@ -596,12 -597,9 +597,12 @@@ batadv_hardif_add_interface(struct net_ goto free_sysfs;

INIT_LIST_HEAD(&hard_iface->list); + INIT_HLIST_HEAD(&hard_iface->neigh_list); INIT_WORK(&hard_iface->cleanup_work, batadv_hardif_remove_interface_finish);

+ spin_lock_init(&hard_iface->neigh_list_lock); + hard_iface->num_bcasts = BATADV_NUM_BCASTS_DEFAULT; if (batadv_is_wifi_netdev(net_dev)) hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;