[Olsr-dev] [PATCH 3/4] smart gateway: remove duplicated calls

[Ferry Huberts]

From: Ferry Huberts <(spam-protected)>

Signed-off-by: Ferry Huberts <(spam-protected)>
---
 src/gateway.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/gateway.c b/src/gateway.c
index eab8785..31a63ab 100644
--- a/src/gateway.c
+++ b/src/gateway.c
@@ -83,18 +83,22 @@ serialize_gw_speed(uint32_t speed) {
 static void smartgw_tunnel_monitor (int if_index,
     struct interface *ifh __attribute__ ((unused)), enum olsr_ifchg_flag flag) {
   if (current_ipv4_gw != NULL && if_index == v4gw_tunnel->if_index && flag == IFCHG_IF_ADD) {
-    /* v4 tunnel up again, set route */
-    olsr_os_inetgw_tunnel_route(v4gw_tunnel->if_index, true, true);
+	/* v4 tunnel up again, set route */
+    /* no need to setup tunnel route, already setup by olsr_set_inet_gateway.
+	olsr_os_inetgw_tunnel_route(v4gw_tunnel->if_index, true, true); */
 
     /* and ip */
-    olsr_os_ifip(v4gw_tunnel->if_index, &olsr_cnf->main_addr, true);
+	/* no need to setup ip, already setup by olsr_os_add_ipip_tunnel.
+    olsr_os_ifip(v4gw_tunnel->if_index, &olsr_cnf->main_addr, true); */
   }
   if (current_ipv6_gw != NULL && if_index == v6gw_tunnel->if_index && flag == IFCHG_IF_ADD) {
-    /* v6 status changed, set route */
-    olsr_os_inetgw_tunnel_route(v6gw_tunnel->if_index, false, true);
+	/* v6 status changed, set route */
+    /* no need to setup tunnel route, already setup by olsr_set_inet_gateway.
+	olsr_os_inetgw_tunnel_route(v6gw_tunnel->if_index, false, true); */
 
     /* and ip */
-    olsr_os_ifip(v6gw_tunnel->if_index, &olsr_cnf->main_addr, true);
+	/* no need to setup ip, already setup by olsr_os_add_ipip_tunnel.
+    olsr_os_ifip(v6gw_tunnel->if_index, &olsr_cnf->main_addr, true); */
   }
 }
 
-- 
1.7.7.3