From e5d0aa91ea74eccc7e63b321c43640658337a836 Mon Sep 17 00:00:00 2001
From: Kamil Cudnik <kcudnik@gmail.com>
Date: Wed, 18 Jan 2017 10:33:23 -0800
Subject: [PATCH] Syncs: Disable STP instance temporary (#149)

Revert this change when SAI implementation supports this.
---
 syncd/syncd_hard_reinit.cpp | 2 +-
 syncd/syncd_reinit.cpp      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/syncd/syncd_hard_reinit.cpp b/syncd/syncd_hard_reinit.cpp
index 360991495ac2..fc197fa68516 100644
--- a/syncd/syncd_hard_reinit.cpp
+++ b/syncd/syncd_hard_reinit.cpp
@@ -439,7 +439,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
     {
         if (shouldSkipCreateion(vid, rid, createObject, [](sai_object_id_t id) { return id == redisGetDefaultStpInstanceId(); }))
         {
-            SWSS_LOG_INFO("default virtual router will not be created, processed VID 0x%lx to RID 0x%lx", vid, rid);
+            SWSS_LOG_INFO("default stp instance will not be created, processed VID 0x%lx to RID 0x%lx", vid, rid);
         }
     }
     else if (objectType == SAI_OBJECT_TYPE_QUEUE)
diff --git a/syncd/syncd_reinit.cpp b/syncd/syncd_reinit.cpp
index 55021bd18f50..a5dc558ea701 100644
--- a/syncd/syncd_reinit.cpp
+++ b/syncd/syncd_reinit.cpp
@@ -996,7 +996,8 @@ void onSyncdStart(bool warmStart)
 
     helperCheckDefaultTrapGroup();
 
-    helperCheckDefaultStpInstance();
+    // currently STP is disabled since not all vendors supports that
+    //helperCheckDefaultStpInstance();
 
     helperCheckVlanId();