The following commit has been merged in the merge/master branch: commit 8c21581f4dbd3df9e28a2fe05034eb683cf4a1dd Merge: 4e90f564b1049a091604ba64f2943ebde8f2c59b dbfacf6d106ccd90f7a56ce76d1bacbee6cf97e1 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun May 8 06:33:18 2016 +0800

Merge branch 'next'

diff --combined net/batman-adv/bat_v.c index d818203,0a12e5c..c16cd44 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@@ -27,6 -27,7 +27,7 @@@ #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> + #include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h>

@@@ -118,6 -119,14 +119,6 @@@ batadv_v_hardif_neigh_init(struct batad batadv_v_elp_throughput_metric_update); }

-static void batadv_v_ogm_schedule(struct batadv_hard_iface *hard_iface) -{ -} - -static void batadv_v_ogm_emit(struct batadv_forw_packet *forw_packet) -{ -} - /** * batadv_v_orig_print_neigh - print neighbors for the originator table * @orig_node: the orig_node for which the neighbors are printed @@@ -331,6 -340,8 +332,6 @@@ static struct batadv_algo_ops batadv_ba .bat_iface_update_mac = batadv_v_iface_update_mac, .bat_primary_iface_set = batadv_v_primary_iface_set, .bat_hardif_neigh_init = batadv_v_hardif_neigh_init, - .bat_ogm_emit = batadv_v_ogm_emit, - .bat_ogm_schedule = batadv_v_ogm_schedule, .bat_orig_print = batadv_v_orig_print, .bat_neigh_cmp = batadv_v_neigh_cmp, .bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob,