Merge tag 'iommu-updates-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[cascardo/linux.git] / net / batman-adv / bat_iv_ogm.c

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 948a5b4..19b0abd 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -15,7 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bat_algo.h"
+#include "bat_iv_ogm.h"
 #include "main.h"
 
 #include <linux/atomic.h>
@@ -49,9 +49,11 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
+#include "bat_algo.h"
 #include "bitarray.h"
 #include "hard-interface.h"
 #include "hash.h"
+#include "log.h"
 #include "network-coding.h"
 #include "originator.h"
 #include "packet.h"
@@ -1851,8 +1853,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,
        /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface
         * that does not have B.A.T.M.A.N. IV enabled ?
         */
-       if (bat_priv->bat_algo_ops->bat_iface_enable !=
-           batadv_iv_ogm_iface_enable)
+       if (bat_priv->algo_ops->iface.enable != batadv_iv_ogm_iface_enable)
                return NET_RX_DROP;
 
        batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX);
@@ -2118,18 +2119,24 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface)
 
 static struct batadv_algo_ops batadv_batman_iv __read_mostly = {
        .name = "BATMAN_IV",
-       .bat_iface_activate = batadv_iv_iface_activate,
-       .bat_iface_enable = batadv_iv_ogm_iface_enable,
-       .bat_iface_disable = batadv_iv_ogm_iface_disable,
-       .bat_iface_update_mac = batadv_iv_ogm_iface_update_mac,
-       .bat_primary_iface_set = batadv_iv_ogm_primary_iface_set,
-       .bat_neigh_cmp = batadv_iv_ogm_neigh_cmp,
-       .bat_neigh_is_similar_or_better = batadv_iv_ogm_neigh_is_sob,
-       .bat_neigh_print = batadv_iv_neigh_print,
-       .bat_orig_print = batadv_iv_ogm_orig_print,
-       .bat_orig_free = batadv_iv_ogm_orig_free,
-       .bat_orig_add_if = batadv_iv_ogm_orig_add_if,
-       .bat_orig_del_if = batadv_iv_ogm_orig_del_if,
+       .iface = {
+               .activate = batadv_iv_iface_activate,
+               .enable = batadv_iv_ogm_iface_enable,
+               .disable = batadv_iv_ogm_iface_disable,
+               .update_mac = batadv_iv_ogm_iface_update_mac,
+               .primary_set = batadv_iv_ogm_primary_iface_set,
+       },
+       .neigh = {
+               .cmp = batadv_iv_ogm_neigh_cmp,
+               .is_similar_or_better = batadv_iv_ogm_neigh_is_sob,
+               .print = batadv_iv_neigh_print,
+       },
+       .orig = {
+               .print = batadv_iv_ogm_orig_print,
+               .free = batadv_iv_ogm_orig_free,
+               .add_if = batadv_iv_ogm_orig_add_if,
+               .del_if = batadv_iv_ogm_orig_del_if,
+       },
 };
 
 int __init batadv_iv_init(void)