Merge pull request #76 from Intel-BMC/update1-0.86

Update

1 files changed, 5 insertions, 4 deletions

diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in
index d07b9e2f0..7a630f5fe 100644
--- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in
+++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in
@@ -54,15 +54,15 @@ gbmc_ncsi_nft_update() {
     if (( ${#ip_bytes[@]} != 0 )); then
       ip_bytes[8]=0xfd
       pfx="$(ip_bytes_to_str ip_bytes)"
-      contents+="        ip6 saddr != $pfx/72 ip6 daddr"
-      contents+=" $pfx/72 goto ncsi_gbmc_br_pub_input"$'\n'
+      contents+="        ip6 saddr != $pfx/76 ip6 daddr"
+      contents+=" $pfx/76 goto ncsi_gbmc_br_pub_input"$'\n'
     fi
   fi
 
   contents+='    }'$'\n'
   contents+='    chain ncsi_forward {'$'\n'
   if [ -n "$pfx" ]; then
-    contents+="        ip6 saddr != $pfx/72 ip6 daddr $pfx/72 accept"$'\n'
+    contents+="        ip6 saddr != $pfx/76 ip6 daddr $pfx/76 accept"$'\n'
   fi
   contents+='    }'$'\n'
   contents+='}'$'\n'
@@ -80,7 +80,8 @@ gbmc_ncsi_nft_hook() {
   if [ "$change" = 'init' ]; then
     gbmc_ncsi_nft_init=1
     gbmc_ncsi_nft_update
-  elif [ "$change" = 'addr' -a "$intf" = '@NCSI_IF@' -a "$scope" = 'global' ]; then
+  elif [ "$change" = 'addr' -a "$intf" = '@NCSI_IF@' -a "$scope" = 'global' ] &&
+     [[ "$flags" != *deprecated* ]]; then
     if [ "$fam" = 'inet6' ]; then
       local -n lastip='gbmc_ncsi_nft_lastip6'
     else