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>

diff --cc lib/lib_errors.c
Simple merge

diff --cc lib/libfrr.c
Simple merge

diff --cc lib/stream.c
Simple merge

diff --cc lib/vrf.c
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc ospfd/ospf_sr.c
Simple merge

diff --cc zebra/if_ioctl_solaris.c
index 6ad590973627debe625b473c4333763f040ec5e4,7ec73ea111cd9b55bbf2d8f7bc0f14d00a3ca28c..1f12d4c02c80b88eaf8c7d4ec211fc0c0bf5e1f9
--- 1/zebra/if_ioctl_solaris.c
--- 2/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/if_netlink.c
Simple merge

diff --cc zebra/interface.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/rtread_getmsg.c
index c82f68984105726f54c794a4f7ec13d374cbc6d2,8e5d7fbdbee5d5d6dfc16c669bf0d97f5377e23c..40982639c14dc12974da31f4a6a0831ef64abca4
--- 1/zebra/rtread_getmsg.c
--- 2/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_rib.c
Simple merge

diff --cc zebra/zebra_vxlan.c
index 1570edcad702b419b982c1bfcc09bcca038fc94c,eb1b07170129c495c17f0ea86f5917d4abe3dad7..a0a90ac28c2fa4e1999f0c86ccb769358b2363d2
--- 1/zebra/zebra_vxlan.c
--- 2/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;
        }
  }