From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 12 Sep 2018 19:58:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'frr/master' into warnings
X-Git-Tag: frr-7.0.1~384^2
X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=e991eff5b5773e8a85c3f4c4f92c09fe30cf680b

Merge remote-tracking branch 'frr/master' into warnings

Conflicts:
	zebra/if_ioctl_solaris.c
	zebra/rtread_getmsg.c

Signed-off-by: David Lamparter <equinox@diac24.net>
---

e991eff5b5773e8a85c3f4c4f92c09fe30cf680b
diff --cc zebra/if_ioctl_solaris.c
index 6ad590973,7ec73ea11..1f12d4c02
--- a/zebra/if_ioctl_solaris.c
+++ b/zebra/if_ioctl_solaris.c
@@@ -39,7 -39,7 +39,8 @@@
  #include "zebra/interface.h"
  #include "zebra/ioctl_solaris.h"
  #include "zebra/rib.h"
+ #include "zebra/rt.h"
 +#include "zebra/zebra_errors.h"
  
  static int if_get_addr(struct interface *, struct sockaddr *, const char *);
  static void interface_info_ioctl(struct interface *);
@@@ -80,11 -79,8 +80,9 @@@ calculate_lifc_len
  	}
  
  	if (ret < 0) {
 -		zlog_warn("interface_list_ioctl: SIOCGLIFNUM failed %s",
 -			  safe_strerror(errno));
 +		flog_err_sys(LIB_ERR_SYSTEM_CALL,
 +			     "interface_list_ioctl: SIOCGLIFNUM failed %s",
- 			     safe_strerror(save_errno));
++			     safe_strerror(errno));
  		close(sock);
  		return -1;
  	}
diff --cc zebra/rtread_getmsg.c
index c82f68984,8e5d7fbdb..40982639c
--- a/zebra/rtread_getmsg.c
+++ b/zebra/rtread_getmsg.c
@@@ -32,7 -31,7 +32,8 @@@
  
  #include "zebra/rib.h"
  #include "zebra/rt.h"
+ #include "zebra/zebra_pbr.h"
 +#include "zebra/zebra_errors.h"
  
  /* Thank you, Solaris, for polluting application symbol namespace. */
  #undef hook_register
diff --cc zebra/zebra_vxlan.c
index 1570edcad,eb1b07170..a0a90ac28
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@@ -207,9 -207,12 +207,12 @@@ static int host_rb_entry_compare(const 
  			return 1;
  
  		return 0;
+ 	} else if (hle1->p.family == AF_INET6) {
+ 		return memcmp(&hle1->p.u.prefix6, &hle2->p.u.prefix6,
+ 			      IPV6_MAX_BYTELEN);
  	} else {
 -		zlog_warn("%s: Unexpected family type: %d", __PRETTY_FUNCTION__,
 -			  hle1->p.family);
 +		zlog_debug("%s: Unexpected family type: %d",
 +			   __PRETTY_FUNCTION__, hle1->p.family);
  		return 0;
  	}
  }