diff options
| author | Nithin Raju <nithin@vmware.com> | 2015-11-25 12:00:56 -0800 |
|---|---|---|
| committer | Gurucharan Shetty <gshetty@nicira.com> | 2015-11-25 13:54:33 -0800 |
| commit | 12e888bae3b29b83d2c0877bbbfb07ce42089539 (patch) | |
| tree | 1e510de30e3542ee3857e4d7952f46a02e6fdf37 /datapath-windows/ovsext/BufferMgmt.c | |
| parent | 9be4a8373394c3afcf80a4b02a12a914e7fc1eb9 (diff) | |
| download | openvswitch-12e888bae3b29b83d2c0877bbbfb07ce42089539.tar.gz | |
datapath-windows: nuke port # argument in IP helper
Port # doesn't make much sense since it has not been computed yet.
Also, get rid of OVS_DEFAULT_PORT_NO and use OVS_DPPORT_NUMBER_INVALID
instead.
Signed-off-by: Nithin Raju <nithin@vmware.com>
Acked-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows/ovsext/BufferMgmt.c')
| -rw-r--r-- | datapath-windows/ovsext/BufferMgmt.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/datapath-windows/ovsext/BufferMgmt.c b/datapath-windows/ovsext/BufferMgmt.c index ab7a18e91..7ec073b70 100644 --- a/datapath-windows/ovsext/BufferMgmt.c +++ b/datapath-windows/ovsext/BufferMgmt.c @@ -88,6 +88,7 @@ #include "Flow.h" #include "Checksum.h" #include "PacketParser.h" +#include "Vport.h" /* * -------------------------------------------------------------------------- @@ -418,7 +419,7 @@ OvsAllocateFixSizeNBL(PVOID ovsContext, OvsInitNBLContext(ctx, OVS_BUFFER_FROM_FIX_SIZE_POOL | OVS_BUFFER_PRIVATE_FORWARD_CONTEXT, size, - OVS_DEFAULT_PORT_NO); + OVS_DPPORT_NUMBER_INVALID); line = __LINE__; allocate_done: OVS_LOG_LOUD("Allocate Fix NBL: %p, line: %d", nbl, line); @@ -531,7 +532,7 @@ OvsAllocateVariableSizeNBL(PVOID ovsContext, OvsInitNBLContext(ctx, OVS_BUFFER_PRIVATE_MDL | OVS_BUFFER_PRIVATE_DATA | OVS_BUFFER_PRIVATE_FORWARD_CONTEXT | OVS_BUFFER_FROM_ZERO_SIZE_POOL, - size, OVS_DEFAULT_PORT_NO); + size, OVS_DPPORT_NUMBER_INVALID); OVS_LOG_LOUD("Allocate variable size NBL: %p", nbl); return nbl; @@ -583,7 +584,8 @@ OvsInitExternalNBLContext(PVOID ovsContext, * we use first nb to decide whether we need advance or retreat during * complete. */ - OvsInitNBLContext(ctx, flags, NET_BUFFER_DATA_LENGTH(nb), OVS_DEFAULT_PORT_NO); + OvsInitNBLContext(ctx, flags, NET_BUFFER_DATA_LENGTH(nb), + OVS_DPPORT_NUMBER_INVALID); return ctx; } @@ -799,7 +801,7 @@ OvsPartialCopyNBL(PVOID ovsContext, srcNb = NET_BUFFER_LIST_FIRST_NB(nbl); OvsInitNBLContext(dstCtx, flags, NET_BUFFER_DATA_LENGTH(srcNb) - copySize, - OVS_DEFAULT_PORT_NO); + OVS_DPPORT_NUMBER_INVALID); InterlockedIncrement((LONG volatile *)&srcCtx->refCount); @@ -1053,7 +1055,7 @@ OvsFullCopyNBL(PVOID ovsContext, OVS_BUFFER_PRIVATE_FORWARD_CONTEXT; OvsInitNBLContext(dstCtx, flags, NET_BUFFER_DATA_LENGTH(firstNb), - OVS_DEFAULT_PORT_NO); + OVS_DPPORT_NUMBER_INVALID); #ifdef DBG OvsDumpNetBufferList(nbl); |