From 2b8940ac493cc3902db9972e58b8708d481938c8 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Mon, 25 Feb 2019 21:03:28 +0530
Subject: [PATCH] HostDev: Change default mac mode to resolve

Note - this will cause regressions in current API scripts if fixed was
assumed as default. Fix is to explicitly specify fixed
---
 common/mac.proto |  4 ++--
 common/mac.ui    | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/mac.proto b/common/mac.proto
index 1bd07f4..1c0a468 100644
--- a/common/mac.proto
+++ b/common/mac.proto
@@ -33,13 +33,13 @@ message Mac {
 
     // Dst Mac
     optional uint64            dst_mac = 1;
-    optional MacAddrMode    dst_mac_mode = 2 [default = e_mm_fixed];
+    optional MacAddrMode       dst_mac_mode = 2 [default = e_mm_resolve];
     optional uint32            dst_mac_count = 3 [default = 16];
     optional uint32            dst_mac_step = 4 [default = 1];
 
     // Src Mac
     optional uint64            src_mac = 5;
-    optional MacAddrMode    src_mac_mode = 6 [default = e_mm_fixed];
+    optional MacAddrMode       src_mac_mode = 6 [default = e_mm_resolve];
     optional uint32            src_mac_count = 7 [default = 16];
     optional uint32            src_mac_step = 8 [default = 1];
 }
diff --git a/common/mac.ui b/common/mac.ui
index dfa8247..66c88d4 100644
--- a/common/mac.ui
+++ b/common/mac.ui
@@ -15,16 +15,16 @@
   </property>
   <layout class="QGridLayout">
    <item row="0" column="1">
-    <widget class="QLabel" name="label_6">
+    <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Address</string>
+      <string>Mode</string>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
-    <widget class="QLabel" name="label_2">
+    <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Mode</string>
+      <string>Address</string>
      </property>
     </widget>
    </item>
@@ -50,16 +50,6 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="MacEdit" name="leDstMac">
-     <property name="minimumSize">
-      <size>
-       <width>120</width>
-       <height>0</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
     <widget class="QComboBox" name="cmbDstMacMode">
      <item>
       <property name="text">
@@ -83,6 +73,16 @@
      </item>
     </widget>
    </item>
+   <item row="1" column="2">
+    <widget class="MacEdit" name="leDstMac">
+     <property name="minimumSize">
+      <size>
+       <width>120</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="3">
     <widget class="IntEdit" name="leDstMacCount">
      <property name="enabled">
@@ -105,9 +105,6 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="MacEdit" name="leSrcMac"/>
-   </item>
-   <item row="2" column="2">
     <widget class="QComboBox" name="cmbSrcMacMode">
      <item>
       <property name="text">
@@ -131,6 +128,9 @@
      </item>
     </widget>
    </item>
+   <item row="2" column="2">
+    <widget class="MacEdit" name="leSrcMac"/>
+   </item>
    <item row="2" column="3">
     <widget class="IntEdit" name="leSrcMacCount">
      <property name="enabled">