Merge branch 'master' into sriharsha.v4v6-hash-changes

Author: sriharsha-nexthop

mclagsyncd/mclaglink.cpp

@@ -193,7 +193,8 @@ void MclagLink::setPortIsolate(char *msg)
         BRCM_PLATFORM_SUBSTRING,
         BFN_PLATFORM_SUBSTRING,
         CTC_PLATFORM_SUBSTRING,
-        MRVL_PRST_PLATFORM_SUBSTRING
+        MRVL_PRST_PLATFORM_SUBSTRING,
+        MRVL_TL_PLATFORM_SUBSTRING
     };
 
     const char *platform = getenv("platform");

mclagsyncd/mclaglink.h

@@ -55,6 +55,7 @@
 #define BFN_PLATFORM_SUBSTRING  "barefoot"
 #define CTC_PLATFORM_SUBSTRING  "centec"
 #define MRVL_PRST_PLATFORM_SUBSTRING "marvell-prestera"
+#define MRVL_TL_PLATFORM_SUBSTRING   "marvell-teralynx"
 
 using namespace std;