X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=isisd%2Fisis_constants.h;h=25eae06cb0af0d473957bb1232fd2ac486aded13;hb=c52e2ecf95a9be318912caacc0851d9307e679f7;hp=17616d671b55658aca033f7f1a72471b7fb00bf1;hpb=6a49d0cc12ff5192291bcc4e5c7ac8bec5c1e78c;p=mirror_frr.git

diff --git a/isisd/isis_constants.h b/isisd/isis_constants.h
index 17616d671..25eae06cb 100644
--- a/isisd/isis_constants.h
+++ b/isisd/isis_constants.h
@@ -1,23 +1,23 @@
 /*
- * IS-IS Rout(e)ing protocol - isis_constants.h   
+ * IS-IS Rout(e)ing protocol - isis_constants.h
  *
  * Copyright (C) 2001,2002   Sampo Saaristo
- *                           Tampere University of Technology      
+ *                           Tampere University of Technology
  *                           Institute of Communications Engineering
  *
- * This program is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public Licenseas published by the Free 
- * Software Foundation; either version 2 of the License, or (at your option) 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public Licenseas 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 
+ * 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; if not, write to the Free Software Foundation, Inc., 
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * 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 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
@@ -163,12 +165,18 @@
 /* we need to be aware of the fact we are using ISO sized
  * packets, using isomtu = mtu - LLC_LEN
  */
-#define ISO_MTU(C) \
-          ((if_is_broadcast ((C)->interface)) ? \
-           (C->interface->mtu - LLC_LEN) : (C->interface->mtu))
-
-#ifndef ETH_ALEN
-#define ETH_ALEN 6
-#endif
+#define ISO_MTU(C)                                                             \
+	((if_is_broadcast((C)->interface)) ? (C->interface->mtu - LLC_LEN)     \
+					   : (C->interface->mtu))
+
+#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 */