Fix for nexthop as IPv4 mapped IPv6 address

1. Macro name change to IS_MAPPED_IPV6.
2. Minor change in zebra/rt_netlink.c on a conditional statement.

Signed-off-by: Kaushik <kaushik@niralnetworks.com>

Author: KaushikNiral

bgpd/bgp_nht.c

@@ -552,8 +552,7 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p)
 			p->u.prefix4 = p_orig->u.prefix4;
 			p->prefixlen = p_orig->prefixlen;
 		} else {
-			if (IS_MAPPED_IPV6(
-				    &pi->attr->mp_nexthop_global)) {
+			if (IS_MAPPED_IPV6(&pi->attr->mp_nexthop_global)) {
 				ipv4_mapped_ipv6_to_ipv4(
 					&pi->attr->mp_nexthop_global, &ipv4);
 				p->u.prefix4 = ipv4;

zebra/rt_netlink.c

@@ -1048,7 +1048,7 @@ static void _netlink_route_nl_add_gateway_info(uint8_t route_family,
 	} else {
 
 		if (!(nexthop->rparent
-		    && IS_MAPPED_IPV6(&nexthop->rparent->gate.ipv6))) {
+		      && IS_MAPPED_IPV6(&nexthop->rparent->gate.ipv6))) {
 			if (gw_family == AF_INET)
 				addattr_l(nlmsg, req_size, RTA_GATEWAY,
 					  &nexthop->gate.ipv4, bytelen);