diff options
author | Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 2013-04-25 05:57:42 -0400 |
---|---|---|
committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-09 15:22:32 -0400 |
commit | 9f4980e68b4b72e6a4d7caadfacc54260d05ebf6 (patch) | |
tree | ddff273e32b44ba11aefcf9d380f47563504a194 /net/batman-adv/main.c | |
parent | 0035f97e65761099cbfa9554ee8cd9bfc395eeea (diff) |
batman-adv: remove vis functionality
This is replaced by a userspace program, we don't need this
functionality to bloat the kernel.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv/main.c')
-rw-r--r-- | net/batman-adv/main.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index fc55acbacacf..43dc92e79a76 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include "distributed-arp-table.h" | 38 | #include "distributed-arp-table.h" |
39 | #include "unicast.h" | 39 | #include "unicast.h" |
40 | #include "gateway_common.h" | 40 | #include "gateway_common.h" |
41 | #include "vis.h" | ||
42 | #include "hash.h" | 41 | #include "hash.h" |
43 | #include "bat_algo.h" | 42 | #include "bat_algo.h" |
44 | #include "network-coding.h" | 43 | #include "network-coding.h" |
@@ -112,8 +111,6 @@ int batadv_mesh_init(struct net_device *soft_iface) | |||
112 | spin_lock_init(&bat_priv->tt.roam_list_lock); | 111 | spin_lock_init(&bat_priv->tt.roam_list_lock); |
113 | spin_lock_init(&bat_priv->tt.last_changeset_lock); | 112 | spin_lock_init(&bat_priv->tt.last_changeset_lock); |
114 | spin_lock_init(&bat_priv->gw.list_lock); | 113 | spin_lock_init(&bat_priv->gw.list_lock); |
115 | spin_lock_init(&bat_priv->vis.hash_lock); | ||
116 | spin_lock_init(&bat_priv->vis.list_lock); | ||
117 | spin_lock_init(&bat_priv->tvlv.container_list_lock); | 114 | spin_lock_init(&bat_priv->tvlv.container_list_lock); |
118 | spin_lock_init(&bat_priv->tvlv.handler_list_lock); | 115 | spin_lock_init(&bat_priv->tvlv.handler_list_lock); |
119 | 116 | ||
@@ -137,10 +134,6 @@ int batadv_mesh_init(struct net_device *soft_iface) | |||
137 | batadv_tt_local_add(soft_iface, soft_iface->dev_addr, | 134 | batadv_tt_local_add(soft_iface, soft_iface->dev_addr, |
138 | BATADV_NULL_IFINDEX); | 135 | BATADV_NULL_IFINDEX); |
139 | 136 | ||
140 | ret = batadv_vis_init(bat_priv); | ||
141 | if (ret < 0) | ||
142 | goto err; | ||
143 | |||
144 | ret = batadv_bla_init(bat_priv); | 137 | ret = batadv_bla_init(bat_priv); |
145 | if (ret < 0) | 138 | if (ret < 0) |
146 | goto err; | 139 | goto err; |
@@ -173,8 +166,6 @@ void batadv_mesh_free(struct net_device *soft_iface) | |||
173 | 166 | ||
174 | batadv_purge_outstanding_packets(bat_priv, NULL); | 167 | batadv_purge_outstanding_packets(bat_priv, NULL); |
175 | 168 | ||
176 | batadv_vis_quit(bat_priv); | ||
177 | |||
178 | batadv_gw_node_purge(bat_priv); | 169 | batadv_gw_node_purge(bat_priv); |
179 | batadv_nc_mesh_free(bat_priv); | 170 | batadv_nc_mesh_free(bat_priv); |
180 | batadv_dat_free(bat_priv); | 171 | batadv_dat_free(bat_priv); |
@@ -412,8 +403,6 @@ static void batadv_recv_handler_init(void) | |||
412 | batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet; | 403 | batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet; |
413 | /* broadcast packet */ | 404 | /* broadcast packet */ |
414 | batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; | 405 | batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; |
415 | /* vis packet */ | ||
416 | batadv_rx_handler[BATADV_VIS] = batadv_recv_vis_packet; | ||
417 | /* unicast tvlv packet */ | 406 | /* unicast tvlv packet */ |
418 | batadv_rx_handler[BATADV_UNICAST_TVLV] = batadv_recv_unicast_tvlv; | 407 | batadv_rx_handler[BATADV_UNICAST_TVLV] = batadv_recv_unicast_tvlv; |
419 | } | 408 | } |