From 9a80ee1443134fe36d15c76bc77b567315f948f9 Mon Sep 17 00:00:00 2001 From: Sairam Venugopal Date: Mon, 26 Oct 2015 16:48:39 -0700 Subject: datapath-windows: Move OvsAllocateNBLFromBuffer to BufferMgmt Move the functionality around creating an NBL from Buffer to Buffermanagement. This function will be used for converting the buffer from user-space to NBL and also by STT - reassembly logic. Signed-off-by: Sairam Venugopal Acked-by: Nithin Raju Signed-off-by: Gurucharan Shetty --- datapath-windows/ovsext/User.c | 48 ++---------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) (limited to 'datapath-windows/ovsext/User.c') diff --git a/datapath-windows/ovsext/User.c b/datapath-windows/ovsext/User.c index e7be9045c..78286870a 100644 --- a/datapath-windows/ovsext/User.c +++ b/datapath-windows/ovsext/User.c @@ -257,50 +257,6 @@ OvsAllocateForwardingContextForNBL(POVS_SWITCH_CONTEXT switchContext, switchContext->NdisSwitchContext, nbl); } -/* - * -------------------------------------------------------------------------- - * This function allocates all the stuff necessary for creating an NBL from the - * input buffer of specified length, namely, a nonpaged data buffer of size - * length, an MDL from it, and a NB and NBL from it. It does not allocate an NBL - * context yet. It also copies data from the specified buffer to the NBL. - * -------------------------------------------------------------------------- - */ -PNET_BUFFER_LIST -OvsAllocateNBLForUserBuffer(POVS_SWITCH_CONTEXT switchContext, - PVOID userBuffer, - ULONG length) -{ - UINT8 *data = NULL; - PNET_BUFFER_LIST nbl = NULL; - PNET_BUFFER nb; - PMDL mdl; - - if (length > OVS_DEFAULT_DATA_SIZE) { - nbl = OvsAllocateVariableSizeNBL(switchContext, length, - OVS_DEFAULT_HEADROOM_SIZE); - - } else { - nbl = OvsAllocateFixSizeNBL(switchContext, length, - OVS_DEFAULT_HEADROOM_SIZE); - } - if (nbl == NULL) { - return NULL; - } - - nb = NET_BUFFER_LIST_FIRST_NB(nbl); - mdl = NET_BUFFER_CURRENT_MDL(nb); - data = (PUINT8)MmGetSystemAddressForMdlSafe(mdl, LowPagePriority) + - NET_BUFFER_CURRENT_MDL_OFFSET(nb); - if (!data) { - OvsCompleteNBL(switchContext, nbl, TRUE); - return NULL; - } - - NdisMoveMemory(data, userBuffer, length); - - return nbl; -} - /* *---------------------------------------------------------------------------- * OvsNlExecuteCmdHandler -- @@ -454,8 +410,8 @@ OvsExecuteDpIoctl(OvsPacketExecute *execute) * Allocate the NBL, copy the data from the userspace buffer. Allocate * also, the forwarding context for the packet. */ - pNbl = OvsAllocateNBLForUserBuffer(gOvsSwitchContext, execute->packetBuf, - execute->packetLen); + pNbl = OvsAllocateNBLFromBuffer(gOvsSwitchContext, execute->packetBuf, + execute->packetLen); if (pNbl == NULL) { status = STATUS_NO_MEMORY; goto exit; -- cgit v1.2.1