diff mbox

[ovs-dev] datapath-windows: Fix conntrack event handler

Message ID 20160909213326.206856-1-vsairam@vmware.com
State Accepted
Headers show

Commit Message

Sairam Venugopal Sept. 9, 2016, 9:33 p.m. UTC 
Fix an issue with the OvsReadEventCmdHandler when handling conntrack
events. Reverting the previous review comment since the inputBuffer in
this case will be NULL.

Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
---
 datapath-windows/ovsext/Datapath.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Nithin Raju Sept. 12, 2016, 6:51 a.m. UTC | #1 
Loos good. Can you pls. add the following comment as well:
/* Driver intiated messages should have zero seq number */


Acked-by: Nithin Raju <nithin@vmware.com>

>>Fix an issue with the OvsReadEventCmdHandler when handling conntrack
>>events. Reverting the previous review comment since the inputBuffer in
>>this case will be NULL.
>>
>>Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
>>---
>> datapath-windows/ovsext/Datapath.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>>diff --git a/datapath-windows/ovsext/Datapath.c
>>b/datapath-windows/ovsext/Datapath.c
>>index 745cdb6..e2b3273 100644
>>--- a/datapath-windows/ovsext/Datapath.c
>>+++ b/datapath-windows/ovsext/Datapath.c
>>@@ -1673,7 +1673,6 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT
>>usrParamsCtx,
>>                        UINT32 *replyLen)
>> {
>>     POVS_MESSAGE msgOut = (POVS_MESSAGE)usrParamsCtx->outputBuffer;
>>-    POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
>>     POVS_OPEN_INSTANCE instance =
>>         (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
>>     NL_BUFFER nlBuf;
>>@@ -1712,7 +1711,7 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT
>>usrParamsCtx,
>>                                            usrParamsCtx->outputBuffer,
>>                                            usrParamsCtx->outputLength,
>>                                            ctEventEntry.type,
>>-                                           msgIn->nlMsg.nlmsgSeq,
>>+                                           0, /* No input msg */
>>                 
>>usrParamsCtx->ovsInstance->pid,
>>                                            NFNETLINK_V0,
>>                                            gOvsSwitchContext->dpNo);
>>-- 
>>2.9.0.windows.1
>>
>
diff mbox

Patch

diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c
index 745cdb6..e2b3273 100644
--- a/datapath-windows/ovsext/Datapath.c
+++ b/datapath-windows/ovsext/Datapath.c
@@ -1673,7 +1673,6 @@  OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
                        UINT32 *replyLen)
 {
     POVS_MESSAGE msgOut = (POVS_MESSAGE)usrParamsCtx->outputBuffer;
-    POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
     POVS_OPEN_INSTANCE instance =
         (POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
     NL_BUFFER nlBuf;
@@ -1712,7 +1711,7 @@  OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
                                            usrParamsCtx->outputBuffer,
                                            usrParamsCtx->outputLength,
                                            ctEventEntry.type,
-                                           msgIn->nlMsg.nlmsgSeq,
+                                           0, /* No input msg */
                                            usrParamsCtx->ovsInstance->pid,
                                            NFNETLINK_V0,
                                            gOvsSwitchContext->dpNo);