@@ -983,7 +983,7 @@ static __inline NDIS_STATUS OvsOutputBeforeSetAction(OvsForwardingContext *ovsFwdCtx) {
PNET_BUFFER_LIST newNbl;
- NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ NDIS_STATUS status;
/*
* Create a copy and work on the copy after this point. The original NBL is @@ -1142,7 +1142,7 @@ static __inline NDIS_STATUS OvsActionMplsPop(OvsForwardingContext *ovsFwdCtx,
ovs_be16 ethertype)
{
- NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ NDIS_STATUS status;
OVS_PACKET_HDR_INFO *layers = &ovsFwdCtx->layers;
EthHdr *ethHdr = NULL;
@@ -1945,7 +1945,7 @@ OvsActionsExecute(POVS_SWITCH_CONTEXT switchContext,
const PNL_ATTR actions,
INT actionsLen)
{
- NDIS_STATUS status = STATUS_SUCCESS;
+ NDIS_STATUS status;
status = OvsDoExecuteActions(switchContext, completionList, curNbl,
portNo, sendFlags, key, hash, layers, @@ -1974,7 +1974,7 @@ OvsDoRecirc(POVS_SWITCH_CONTEXT switchContext,
UINT32 srcPortNo,
OVS_PACKET_HDR_INFO *layers) {
- NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ NDIS_STATUS status;
OvsFlow *flow = NULL;
SV: You could do the same with the 'flow' pointer.
OvsForwardingContext ovsFwdCtx = { 0 };
UINT64 hash = 0;
@@ -723,7 +723,7 @@ done:
static NTSTATUS
_MapFlowInfoToNl(PNL_BUFFER nlBuf, OvsFlowInfo *flowInfo) {
- NTSTATUS rc = STATUS_SUCCESS;
+ NTSTATUS rc;
rc = MapFlowKeyToNlKey(nlBuf, &(flowInfo->key), OVS_FLOW_ATTR_KEY,
OVS_KEY_ATTR_TUNNEL); diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c
@@ -231,7 +231,7 @@ OvsGetIPEntry(NET_LUID interfaceLuid,
NTSTATUS status;
UINT32 i;
- if (ipEntry == NULL || ipEntry == NULL) {
+ if (ipEntry == NULL) {
return STATUS_INVALID_PARAMETER;
}
@@ -1209,7 +1209,7 @@ static VOID
OvsHandleFwdRequest(POVS_IP_HELPER_REQUEST request) {
SOCKADDR_INET dst, src;
- NTSTATUS status = STATUS_SUCCESS;
+ NTSTATUS status;
SV: The same applies for 'fwdEntry', 'ipf' and 'ipn'.
MIB_IPFORWARD_ROW2 ipRoute;
MIB_IPNET_ROW2 ipNeigh;
OVS_FWD_INFO fwdInfo;
@@ -565,7 +565,7 @@ NlMsgPutNested(PNL_BUFFER buf, UINT16 type,
const PVOID data, UINT32 size) {
UINT32 offset = NlMsgStartNested(buf, type);
- BOOLEAN ret = FALSE;
+ BOOLEAN ret;
ASSERT(offset);
@@ -366,7 +366,7 @@ OvsExtOidRequest(NDIS_HANDLE filterModuleContext,
PNDIS_OID_REQUEST oidRequest) {
POVS_SWITCH_CONTEXT switchObject = (POVS_SWITCH_CONTEXT)filterModuleContext;
- NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+ NDIS_STATUS status;
PNDIS_OID_REQUEST clonedOidRequest = NULL;
struct _METHOD *methodInfo = &(oidRequest->DATA.METHOD_INFORMATION);
BOOLEAN completeOid = FALSE;
@@ -93,7 +93,6 @@ OvsParseIPv6(const NET_BUFFER_LIST *packet,
UINT32 nextHdr;
Ipv6Key *flow= &key->ipv6Key;
- ofs = layers->l3Offset;
nh = OvsGetPacketBytes(packet, sizeof *nh, ofs, &ipv6HdrStorage);
if (!nh) {
return NDIS_STATUS_FAILURE;
@@ -214,7 +214,7 @@ static NTSTATUS
OvsInjectPacketThroughActions(PNET_BUFFER_LIST pNbl,
OVS_TUNNEL_PENDED_PACKET *packet) {
- NTSTATUS status = STATUS_SUCCESS;
+ NTSTATUS status;
OvsIPv4TunnelKey tunnelKey;
NET_BUFFER *pNb;
ULONG sendCompleteFlags = 0;
SV: 'datapath' should also be initialized with '&gOvsSwitchContext->datapath' at declaration.
@@ -206,7 +206,7 @@ static OVS_TUNFLT_THREAD_CONTEXT gTunnelThreadCtx[OVS_TUNFLT_MAX_THREADS] = { 0 NTSTATUS OvsTunnelEngineOpen(HANDLE *engineSession) {
- NTSTATUS status = STATUS_SUCCESS;
+ NTSTATUS status;
FWPM_SESSION session = { 0 };
/*
@@ -387,7 +387,7 @@ OvsTunnelRegisterDatagramDataCallouts(const GUID *layerKey,
VOID *deviceObject,
UINT32 *calloutId) {