diff --git a/source/firewall/firewall.c b/source/firewall/firewall.c
index 50538050..556167bd 100644
--- a/source/firewall/firewall.c
+++ b/source/firewall/firewall.c
@@ -12479,7 +12479,10 @@ static int prepare_subtables(FILE *raw_fp, FILE *mangle_fp, FILE *nat_fp, FILE *
    if(bEthWANEnable)
    {
            //ETH WAN is TC XB6 exclusive feature
-            if (strcmp(current_wan_ifname, default_wan_ifname ) == 0)
+	       #ifdef FEATURE_RDKB_CONFIGURABLE_WAN_INTERFACE
+	         fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_wan_ifname);
+	       #else		 
+             if (strcmp(current_wan_ifname, default_wan_ifname ) == 0) 
             {
               fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", current_wan_ifname);
             }
@@ -12487,6 +12490,7 @@ static int prepare_subtables(FILE *raw_fp, FILE *mangle_fp, FILE *nat_fp, FILE *
             {
               fprintf(filter_fp, "-A INPUT -i %s -p tcp -m tcp --dport 22 -j SSH_FILTER\n", default_wan_ifname);
             }
+	       #endif
    }
    else if (erouterSSHEnable)  // Applicable only for PUMA7 platforms
    {