X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip6-nd%2Fip6_ra.c;h=dac5ec0993732554ec243d922783be24b4d72b51;hb=08f843e562de923c8521a4d1d388fbb6d33c3fcf;hp=d3597706293c2e63ecceb8a0801067a7a4effc4c;hpb=63c31e0a609bb3fe5cd61b05dac7b790a9282b8d;p=vpp.git

diff --git a/src/vnet/ip6-nd/ip6_ra.c b/src/vnet/ip6-nd/ip6_ra.c
index d3597706293..dac5ec09937 100644
--- a/src/vnet/ip6-nd/ip6_ra.c
+++ b/src/vnet/ip6-nd/ip6_ra.c
@@ -413,12 +413,9 @@ icmp6_router_solicitation (vlib_main_t * vm,
 
 		  radv_info = ip6_ra_get_itf (sw_if_index0);
 
-		  error0 = ((!radv_info) ?
-			    ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
-			    error0);
-		  error0 = radv_info->send_radv == 0 ?
-			     ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
-			     error0;
+		  error0 = ((!radv_info || 0 == radv_info->send_radv) ?
+			      ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
+			      error0);
 		  if (error0 == ICMP6_ERROR_NONE)
 		    {
 		      f64 now = vlib_time_now (vm);