datapath-windows: Use OVS_DEFAULT_PORT_NO instead of 0 in a few places
authorNithin Raju <nithin@vmware.com>
Fri, 15 Aug 2014 04:02:15 +0000 (21:02 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 22 Aug 2014 17:54:03 +0000 (10:54 -0700)
Signed-off-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Saurabh Shah <ssaurabh@vmware.com>
datapath-windows/ovsext/OvsActions.c
datapath-windows/ovsext/OvsUser.c

index 61b233f..d8fd295 100644 (file)
@@ -271,7 +271,7 @@ OvsDetectTunnelPkt(OvsForwardingContext *ovsFwdCtx,
          * If the packet will not be encapsulated, consume the tunnel context
          * by clearing it.
          */
-        if (ovsFwdCtx->srcVportNo != 0 &&
+        if (ovsFwdCtx->srcVportNo != OVS_DEFAULT_PORT_NO &&
             !OvsIsVifVportNo(ovsFwdCtx->srcVportNo)) {
             ovsFwdCtx->tunKey.dst = 0;
         }
index aac45ae..0880749 100644 (file)
@@ -369,7 +369,8 @@ OvsExecuteDpIoctl(PVOID inputBuffer,
         NdisAcquireRWLockRead(gOvsSwitchContext->dispatchLock, &lockState,
                               NDIS_RWL_AT_DISPATCH_LEVEL);
         ndisStatus = OvsActionsExecute(gOvsSwitchContext, NULL, pNbl,
-                                       vport ? vport->portNo : 0,
+                                       vport ? vport->portNo :
+                                               OVS_DEFAULT_PORT_NO,
                                        NDIS_SEND_FLAGS_SWITCH_DESTINATION_GROUP,
                                        &key, NULL, &layers, actions,
                                        execute->actionsLen);