diff options
Diffstat (limited to 'datapath-windows/ovsext/Netlink')
-rw-r--r-- | datapath-windows/ovsext/Netlink/Netlink.c | 11 | ||||
-rw-r--r-- | datapath-windows/ovsext/Netlink/Netlink.h | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/datapath-windows/ovsext/Netlink/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c index dc1e78c60..1eec320e2 100644 --- a/datapath-windows/ovsext/Netlink/Netlink.c +++ b/datapath-windows/ovsext/Netlink/Netlink.c @@ -109,17 +109,12 @@ NlFillNlHdr(PNL_BUFFER nlBuf, UINT16 nlmsgType, */ VOID NlBuildErrorMsg(POVS_MESSAGE msgIn, POVS_MESSAGE_ERROR msgError, - UINT32 msgErrorLen, - UINT errorCode, UINT32 *msgLen) + UINT errorCode, UINT32 *replyLen) { NL_BUFFER nlBuffer; ASSERT(errorCode != NL_ERROR_PENDING); - if ((msgError == NULL) || (msgErrorLen < sizeof *msgError)) { - return; - } - NlBufInit(&nlBuffer, (PCHAR)msgError, sizeof *msgError); NlFillNlHdr(&nlBuffer, NLMSG_ERROR, 0, msgIn->nlMsg.nlmsgSeq, msgIn->nlMsg.nlmsgPid); @@ -128,9 +123,7 @@ NlBuildErrorMsg(POVS_MESSAGE msgIn, POVS_MESSAGE_ERROR msgError, msgError->errorMsg.nlMsg = msgIn->nlMsg; msgError->nlMsg.nlmsgLen = sizeof(OVS_MESSAGE_ERROR); - if (NULL != msgLen) { - *msgLen = msgError->nlMsg.nlmsgLen; - } + *replyLen = msgError->nlMsg.nlmsgLen; } /* diff --git a/datapath-windows/ovsext/Netlink/Netlink.h b/datapath-windows/ovsext/Netlink/Netlink.h index 63164c716..b1b3bed51 100644 --- a/datapath-windows/ovsext/Netlink/Netlink.h +++ b/datapath-windows/ovsext/Netlink/Netlink.h @@ -96,7 +96,6 @@ BOOLEAN NlFillNlHdr(PNL_BUFFER nlBuf, UINT32 nlmsgSeq, UINT32 nlmsgPid); VOID NlBuildErrorMsg(POVS_MESSAGE msgIn, POVS_MESSAGE_ERROR msgError, - UINT32 msgErrorLen, UINT errorCode, UINT32 *msgLen); /* Netlink message accessing the payload */ |