Skip to content

Commit

Permalink
Merge "If agent doesnt find a covering route, set replacement nh to b…
Browse files Browse the repository at this point in the history
…e 0."
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed May 29, 2015
2 parents 9d0d63c + 13c5475 commit 3a231d7
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions src/vnsw/agent/vrouter/ksync/route_ksync.cc
Original file line number Diff line number Diff line change
Expand Up @@ -602,18 +602,7 @@ int RouteKSyncEntry::DeleteMsg(char *buf, int buf_len) {
}

/* If better route is not found, send discardNH for route */
DiscardNHKey nh_oper_key;
NextHop *nexthop = static_cast<NextHop *>
(ksync_obj_->ksync()->agent()->nexthop_table()->
FindActiveEntry(&nh_oper_key));
if (nexthop != NULL) {
NHKSyncObject *ksync_nh_object =
ksync_obj_->ksync()->nh_ksync_obj();
NHKSyncEntry nh_key(ksync_nh_object, nexthop);
ksync_nh = static_cast<NHKSyncEntry *>(ksync_nh_object->Find(&nh_key));
}

return DeleteInternal(ksync_nh, NULL, buf, buf_len);
return DeleteInternal(NULL, NULL, buf, buf_len);
}

uint8_t RouteKSyncEntry::CopyReplacementData(NHKSyncEntry *nexthop,
Expand Down

0 comments on commit 3a231d7

Please sign in to comment.