Merge tag 'for-5.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux-2.6-microblaze.git] / net / hsr / hsr_main.h

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index a9c30a6..8f26467 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -13,6 +13,7 @@
 #include <linux/netdevice.h>
 #include <linux/list.h>
 #include <linux/if_vlan.h>
+#include <linux/if_hsr.h>
 
 /* Time constants as specified in the HSR specification (IEC-62439-3 2010)
  * Table 8.
@@ -21,6 +22,7 @@
 #define HSR_LIFE_CHECK_INTERVAL                 2000 /* ms */
 #define HSR_NODE_FORGET_TIME           60000 /* ms */
 #define HSR_ANNOUNCE_INTERVAL            100 /* ms */
+#define HSR_ENTRY_FORGET_TIME            400 /* ms */
 
 /* By how much may slave1 and slave2 timestamps of latest received frame from
  * each node differ before we notify of communication problem?
@@ -171,13 +173,6 @@ struct hsr_port {
        enum hsr_port_type      type;
 };
 
-/* used by driver internally to differentiate various protocols */
-enum hsr_version {
-       HSR_V0 = 0,
-       HSR_V1,
-       PRP_V1,
-};
-
 struct hsr_frame_info;
 struct hsr_node;