From b8d9ab0e0a1d5932524397d932341c24056a06ae Mon Sep 17 00:00:00 2001
From: Michael Amal Anand <73233797+michaelamal@users.noreply.github.com>
Date: Thu, 9 Jul 2026 15:00:43 -0400
Subject: [PATCH 1/3] XF10-889 : change ETHWAN MAC to DEVICE MAC in
 network_setup GUI page

Reason for change: change ETHWAN MAC to DEVICE MAC
Test Procedure: build procedure
Risks: Medium
Priority: P0

Signed-off-by: Michael_AmalAnand@comcast.com
---
 source/Styles/xb6/jst/network_setup.jst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/source/Styles/xb6/jst/network_setup.jst b/source/Styles/xb6/jst/network_setup.jst
index a7d1765..74b9820 100644
--- a/source/Styles/xb6/jst/network_setup.jst
+++ b/source/Styles/xb6/jst/network_setup.jst
@@ -444,9 +444,14 @@ function sec2dhm($sec)
 		<?% if(is_docsis_supported()) { ?>
 			<span class="readonlyLabel">CM MAC:</span>
                         <span class="value"><?% echo( strtoupper($CM_value["MACAddress"]));?></span>
-		<?% } else { ?>
-			<span class="readonlyLabel">ETHWAN MAC:</span>
-                        <span class="value"><?% echo( strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC")));?></span>
+		<?% } else { ?>              
+            <?% if (is_PON_Supported()) { ?>
+                 <span class="readonlyLabel">Device MAC:</span>
+            <?% } else { ?>
+                 <span class="readonlyLabel">ETHWAN MAC:</span>
+            <?% } ?>
+            <span class="value">
+            <?% echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?></span>
 		<?% } ?>
 	</div>
 	<?% if(is_wps_supported()) { ?>

From 739e1233ffc3970009b3f90c7e3a1a63c507d5be Mon Sep 17 00:00:00 2001
From: Michael Amal Anand <73233797+michaelamal@users.noreply.github.com>
Date: Thu, 9 Jul 2026 15:10:02 -0400
Subject: [PATCH 2/3] XF10-889 : change ETHWAN MAC to DEVICE MAC in
 network_setup GUI page

Reason for change: change ETHWAN MAC to DEVICE MAC
Test Procedure: build procedure
Risks: Medium
Priority: P0

Signed-off-by: Michael_AmalAnand@comcast.com
---
 source/Styles/xb6/jst/network_setup.jst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/Styles/xb6/jst/network_setup.jst b/source/Styles/xb6/jst/network_setup.jst
index 74b9820..884ccee 100644
--- a/source/Styles/xb6/jst/network_setup.jst
+++ b/source/Styles/xb6/jst/network_setup.jst
@@ -450,8 +450,7 @@ function sec2dhm($sec)
             <?% } else { ?>
                  <span class="readonlyLabel">ETHWAN MAC:</span>
             <?% } ?>
-            <span class="value">
-            <?% echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?></span>
+            <span class="value"><?% echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?></span>
 		<?% } ?>
 	</div>
 	<?% if(is_wps_supported()) { ?>

From 2c0f1a3925a68a7098613e3ad414365ab14fba11 Mon Sep 17 00:00:00 2001
From: Michael Amal Anand <73233797+michaelamal@users.noreply.github.com>
Date: Thu, 9 Jul 2026 15:20:08 -0400
Subject: [PATCH 3/3] XF10-889 : change ETHWAN MAC to DEVICE MAC in
 network_setup GUI page

Reason for change: change ETHWAN MAC to DEVICE MAC
Test Procedure: build procedure
Risks: Medium
Priority: P0

Signed-off-by: Michael_AmalAnand@comcast.com
---
 source/Styles/xb3/jst/includes/utility.jst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst
index 4940913..07d5b81 100644
--- a/source/Styles/xb3/jst/includes/utility.jst
+++ b/source/Styles/xb3/jst/includes/utility.jst
@@ -1335,6 +1335,20 @@ function is_docsis_supported()
         }
 }
 
+/**
+* Description:
+* return the device supports EPON or not
+*/
+function is_PON_Supported()
+{	
+	$epon_status = getenv("PON_SUPPORTED");
+	if($epon_status === "false") {
+		return false;
+        } else {
+                return true;
+        }
+}
+
 /**
 * Description:
 * return the device supports Bridge Mode or not