Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / bgpd / rfapi / rfapi.h

diff --git a/bgpd/rfapi/rfapi.h b/bgpd/rfapi/rfapi.h
index 8eb0d717dfced12f1dcbc31332d9c5c7681f1ba6..44f7507d55a64db8935eb178a51c748c7f410119 100644 (file)
--- a/bgpd/rfapi/rfapi.h
+++ b/bgpd/rfapi/rfapi.h
@@ -1,27 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *
  * Copyright 2009-2016, LabN Consulting, L.L.C.
  *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _QUAGGA_BGP_RFAPI_H
 #define _QUAGGA_BGP_RFAPI_H
 
-#if ENABLE_BGP_VNC
+#ifdef ENABLE_BGP_VNC
 
 #include <stdint.h>
 #include <netinet/in.h>
@@ -33,12 +20,8 @@
 
 /* probably ought to have a field-specific define in config.h */
 #ifndef s6_addr32 /* for solaris/bsd */
-#ifdef SOLARIS_IPV6
-#   define     s6_addr32       _S6_un._S6_u32
-#else
 #   define     s6_addr32       __u6_addr.__u6_addr32
 #endif
-#endif
 
 #define RFAPI_V4_ADDR 0x04
 #define RFAPI_V6_ADDR 0x06
@@ -862,7 +845,7 @@ extern int rfapi_get_response_lifetime_default(void *rfp_start_val);
 /*------------------------------------------
  * rfapi_is_vnc_configured
  *
- * Returns if VNC (BGP VPN messaging /VPN & encap SAFIs) are configured
+ * Returns if VNC is configured
  *
  * input:
  *    rfp_start_val     value returned by rfp_start or