zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / isisd / isis_constants.h

diff --git a/isisd/isis_constants.h b/isisd/isis_constants.h
index d4dd7a225b86f7fe454d658755d08a092edc3f06..25eae06cb0af0d473957bb1232fd2ac486aded13 100644 (file)
--- a/isisd/isis_constants.h
+++ b/isisd/isis_constants.h
@@ -14,10 +14,10 @@
  * 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; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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 ISIS_CONSTANTS_H
@@ -73,7 +73,9 @@
 #define MAX_MIN_LSP_GEN_INTERVAL      120  /* RFC 4444 says 65535 */
 #define DEFAULT_MIN_LSP_GEN_INTERVAL  30
 
-#define MIN_LSP_TRANS_INTERVAL        5
+#define MIN_LSP_RETRANS_INTERVAL      5 /* Seconds */
+
+#define TRIGGERED_IIH_DELAY           50       /* msec */
 
 #define MIN_CSNP_INTERVAL             1
 #define MAX_CSNP_INTERVAL             600
@@ -167,8 +169,14 @@
        ((if_is_broadcast((C)->interface)) ? (C->interface->mtu - LLC_LEN)     \
                                           : (C->interface->mtu))
 
-#ifndef ETH_ALEN
-#define ETH_ALEN 6
-#endif
+#define MAX_LLC_LEN 0x5ff
+#define ETHERTYPE_EXT_LLC 0x8870
+
+static inline uint16_t isis_ethertype(size_t len)
+{
+       if (len > MAX_LLC_LEN)
+               return ETHERTYPE_EXT_LLC;
+       return len;
+}
 
 #endif /* ISIS_CONSTANTS_H */