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/6] 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()) { ?>
CM MAC:
% echo( strtoupper($CM_value["MACAddress"]));?>
- % } else { ?>
- ETHWAN MAC:
- % echo( strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC")));?>
+ % } else { ?>
+ % if (is_PON_Supported()) { ?>
+ Device MAC:
+ % } else { ?>
+ ETHWAN MAC:
+ % } ?>
+
+ % echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?>
% } ?>
% 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/6] 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 { ?>
ETHWAN MAC:
% } ?>
-
- % echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?>
+ % echo(strtoupper(getStr("Device.DeviceInfo.X_COMCAST-COM_CM_MAC"))); ?>
% } ?>
% 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/6] 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
From a0662102d5f2688e2216363012b63c0ea6c3b223 Mon Sep 17 00:00:00 2001
From: Michael Amal Anand <73233797+michaelamal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:55:21 -0400
Subject: [PATCH 4/6] 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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst
index 07d5b81..ef7e08a 100644
--- a/source/Styles/xb3/jst/includes/utility.jst
+++ b/source/Styles/xb3/jst/includes/utility.jst
@@ -1339,10 +1339,10 @@ function is_docsis_supported()
* Description:
* return the device supports EPON or not
*/
-function is_PON_Supported()
+function is_pon_supported()
{
- $epon_status = getenv("PON_SUPPORTED");
- if($epon_status === "false") {
+ $pon_status = getenv("PON_SUPPORTED");
+ if($pon_status === "false") {
return false;
} else {
return true;
From 1c7d642ec690176e6522e2072b00ff8914f44e4d Mon Sep 17 00:00:00 2001
From: Michael Amal Anand <73233797+michaelamal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:57:04 -0400
Subject: [PATCH 5/6] 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst
index ef7e08a..af44841 100644
--- a/source/Styles/xb3/jst/includes/utility.jst
+++ b/source/Styles/xb3/jst/includes/utility.jst
@@ -1337,7 +1337,7 @@ function is_docsis_supported()
/**
* Description:
-* return the device supports EPON or not
+* return whether the device supports PON (e.g., EPON) or not
*/
function is_pon_supported()
{
From c84cc85327c9d32a3aab290f47b38b9d1a0251b1 Mon Sep 17 00:00:00 2001
From: Michael Amal Anand <73233797+michaelamal@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:58:06 -0400
Subject: [PATCH 6/6] 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/Styles/xb6/jst/network_setup.jst b/source/Styles/xb6/jst/network_setup.jst
index 884ccee..a07af6c 100644
--- a/source/Styles/xb6/jst/network_setup.jst
+++ b/source/Styles/xb6/jst/network_setup.jst
@@ -445,7 +445,7 @@ function sec2dhm($sec)
CM MAC:
% echo( strtoupper($CM_value["MACAddress"]));?>
% } else { ?>
- % if (is_PON_Supported()) { ?>
+ % if (is_pon_supported()) { ?>
Device MAC:
% } else { ?>
ETHWAN MAC: