diff options
| -rw-r--r-- | datapath-windows/ovsext/Actions.c | 8 | ||||
| -rw-r--r-- | datapath-windows/ovsext/Datapath.c | 1 | ||||
| -rw-r--r-- | datapath-windows/ovsext/Flow.c | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c index dfa5ecbf6..a93fe0331 100644 --- a/datapath-windows/ovsext/Actions.c +++ b/datapath-windows/ovsext/Actions.c @@ -764,6 +764,7 @@ OvsOutputForwardingCtx(OvsForwardingContext *ovsFwdCtx) { NDIS_STATUS status = STATUS_SUCCESS; POVS_SWITCH_CONTEXT switchContext = ovsFwdCtx->switchContext; + PCWSTR dropReason; /* * Handle the case where the some of the destination ports are tunneled @@ -792,6 +793,7 @@ OvsOutputForwardingCtx(OvsForwardingContext *ovsFwdCtx) if (newNbl == NULL) { status = NDIS_STATUS_RESOURCES; ovsActionStats.noCopiedNbl++; + dropReason = L"Dropped due to failure to create NBL copy."; goto dropit; } } @@ -804,6 +806,7 @@ OvsOutputForwardingCtx(OvsForwardingContext *ovsFwdCtx) if (status != NDIS_STATUS_SUCCESS) { OvsCompleteNBL(ovsFwdCtx->switchContext, newNbl, TRUE); ovsActionStats.cannotGrowDest++; + dropReason = L"Dropped due to failure to update destinations."; goto dropit; } @@ -819,8 +822,7 @@ OvsOutputForwardingCtx(OvsForwardingContext *ovsFwdCtx) ovsFwdCtx->completionList, &ovsFwdCtx->layers, FALSE); if (status != NDIS_STATUS_SUCCESS) { - OvsCompleteNBLForwardingCtx(ovsFwdCtx, - L"Dropped due to resouces"); + dropReason = L"Dropped due to resouces."; goto dropit; } } @@ -841,7 +843,7 @@ OvsOutputForwardingCtx(OvsForwardingContext *ovsFwdCtx) dropit: if (status != NDIS_STATUS_SUCCESS) { - OvsCompleteNBLForwardingCtx(ovsFwdCtx, L"Dropped due to XXX"); + OvsCompleteNBLForwardingCtx(ovsFwdCtx, dropReason); } return status; diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c index 7244b31ba..2d0ff00cd 100644 --- a/datapath-windows/ovsext/Datapath.c +++ b/datapath-windows/ovsext/Datapath.c @@ -26,7 +26,6 @@ #include "User.h" #include "Datapath.h" #include "Jhash.h" -#include "Switch.h" #include "Vport.h" #include "Event.h" #include "User.h" diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index 93f37a0ac..044fde57c 100644 --- a/datapath-windows/ovsext/Flow.c +++ b/datapath-windows/ovsext/Flow.c @@ -1882,7 +1882,6 @@ RemoveFlow(OVS_DATAPATH *datapath, { OvsFlow *f = *flow; *flow = NULL; - UNREFERENCED_PARAMETER(datapath); ASSERT(datapath->nFlows); datapath->nFlows--; |