diff options
| author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
| commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
| tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh | |
| parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
| parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
| download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz | |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh')
| -rw-r--r-- | meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh index 18341fefb..a9bfd74af 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh @@ -67,26 +67,28 @@ gbmc_br_from_ra_update() { gbmc_br_from_ra_hook() { if [ "$change" = 'init' ]; then gbmc_br_from_ra_init=1 + gbmc_ip_monitor_defer + elif [ "$change" = 'defer' ]; then gbmc_br_from_ra_update elif [[ "$change" == 'route' && "$route" != *' via '* ]] && [[ "$route" =~ ^(.* dev gbmcbr proto ra .*)( +expires +([^ ]+)sec).*$ ]]; then pfx="${route%% *}" if [ "$action" = 'add' ]; then gbmc_br_from_ra_pfxs["$pfx"]="${BASH_REMATCH[3]}" - gbmc_br_from_ra_update + gbmc_ip_monitor_defer elif [ "$action" = 'del' ]; then gbmc_br_from_ra_pfxs["$pfx"]=0 - gbmc_br_from_ra_update + gbmc_ip_monitor_defer fi elif [ "$change" = 'link' -a "$intf" = 'gbmcbr' ]; then rdisc6 -m gbmcbr -r 1 -w 100 >/dev/null 2>&1 if [ "$action" = 'add' -a "$mac" != "$gbmc_br_from_ra_mac" ]; then gbmc_br_from_ra_mac="$mac" - gbmc_br_from_ra_update + gbmc_ip_monitor_defer fi if [ "$action" = 'del' -a "$mac" = "$gbmc_br_from_ra_mac" ]; then gbmc_br_from_ra_mac= - gbmc_br_from_ra_update + gbmc_ip_monitor_defer fi fi } |