Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/sonic-sairedis into…
Browse files Browse the repository at this point in the history
… rel_6_0
  • Loading branch information
kram committed Nov 3, 2017
2 parents aa5bf64 + 9658f75 commit c48a7a2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 0 additions & 2 deletions syncd/scripts/syncd_init_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ config_syncd_cavium()
until [ $(redis-cli ping | grep -c PONG) -gt 0 ]; do
sleep 1
done

redis-cli FLUSHALL
}

config_syncd_marvell()
Expand Down
6 changes: 5 additions & 1 deletion vslib/src/sai_vs_hostintf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,11 @@ sai_status_t vs_create_hostif_int(

if (g_vs_hostif_use_tap_device == false)
{
return SAI_STATUS_SUCCESS;
return vs_generic_create(object_type,
hostif_id,
switch_id,
attr_count,
attr_list);
}

// validate SAI_HOSTIF_ATTR_TYPE
Expand Down

0 comments on commit c48a7a2

Please sign in to comment.