[ovs-dev] datapath-windows: Fix broken build on branch 2.4
diff mbox

Message ID 1442950552-4568-1-git-send-email-aserdean@cloudbasesolutions.com
State Accepted
Headers show

Commit Message

Alin Serdean Sept. 22, 2015, 7:35 p.m. UTC
Change variable name to fix compiling.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
This patch is intended only for the branch-2.4
---
 datapath-windows/ovsext/Flow.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Nithin Raju Sept. 22, 2015, 8:14 p.m. UTC | #1
Acked-by: Nithin Raju <nithin@vmware.com>

> On Sep 22, 2015, at 12:35 PM, Alin Serdean <aserdean@cloudbasesolutions.com> wrote:
> 
> Change variable name to fix compiling.
> 
> Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
> ---
> This patch is intended only for the branch-2.4
> ---
> datapath-windows/ovsext/Flow.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c
> index f3726d7..2aea9a4 100644
> --- a/datapath-windows/ovsext/Flow.c
> +++ b/datapath-windows/ovsext/Flow.c
> @@ -254,7 +254,7 @@ OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
>     PNL_MSG_HDR nlMsgHdr = &(msgIn->nlMsg);
>     PGENL_MSG_HDR genlMsgHdr = &(msgIn->genlMsg);
>     POVS_HDR ovsHdr = &(msgIn->ovsHdr);
> -    PNL_ATTR nlAttrs[__OVS_FLOW_ATTR_MAX];
> +    PNL_ATTR flowAttrs[__OVS_FLOW_ATTR_MAX];
>     UINT32 attrOffset = NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN;
>     OvsFlowPut mappedFlow;
>     OvsFlowStats stats;
> @@ -275,7 +275,7 @@ OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
>     /* Get all the top level Flow attributes */
>     if ((NlAttrParse(nlMsgHdr, attrOffset, NlMsgAttrsLen(nlMsgHdr),
>                      nlFlowPolicy, ARRAY_SIZE(nlFlowPolicy),
> -                     nlAttrs, ARRAY_SIZE(nlAttrs)))
> +                     flowAttrs, ARRAY_SIZE(flowAttrs)))
>                      != TRUE) {
>         OVS_LOG_ERROR("Attr Parsing failed for msg: %p",
>                        nlMsgHdr);
> @@ -285,7 +285,7 @@ OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
> 
>     /* FLOW_DEL command w/o any key input is a flush case. */
>     if ((genlMsgHdr->cmd == OVS_FLOW_CMD_DEL) &&
> -        (!(nlAttrs[OVS_FLOW_ATTR_KEY]))) {
> +        (!(flowAttrs[OVS_FLOW_ATTR_KEY]))) {
> 
>         rc = OvsFlushFlowIoctl(ovsHdr->dp_ifindex);
> 
> @@ -315,8 +315,8 @@ OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
>         goto done;
>     }
> 
> -    if ((rc = _MapNlToFlowPut(msgIn, nlAttrs[OVS_FLOW_ATTR_KEY],
> -         nlAttrs[OVS_FLOW_ATTR_ACTIONS], nlAttrs[OVS_FLOW_ATTR_CLEAR],
> +    if ((rc = _MapNlToFlowPut(msgIn, flowAttrs[OVS_FLOW_ATTR_KEY],
> +         flowAttrs[OVS_FLOW_ATTR_ACTIONS], flowAttrs[OVS_FLOW_ATTR_CLEAR],
>          &mappedFlow))
>         != STATUS_SUCCESS) {
>         OVS_LOG_ERROR("Conversion to OvsFlowPut failed");
> -- 
> 1.9.5.msysgit.0
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailman_listinfo_dev&d=BQIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=pNHQcdr7B40b4h6Yb7FIedI1dnBsxdDuTLBYD3JqV80&m=aWdrnyYUwbnOmGhy-cWUPFi9kNebWb7lNoGJHO15Xg4&s=e6LKO5-oJZjvArSc3bkWZNlcUtqYySa6fl-RHSoG3KA&e=
Ben Pfaff Sept. 29, 2015, 11:59 p.m. UTC | #2
On Tue, Sep 22, 2015 at 07:35:43PM +0000, Alin Serdean wrote:
> Change variable name to fix compiling.
> 
> Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
> ---
> This patch is intended only for the branch-2.4

Applied, thanks!

Patch
diff mbox

diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c
index f3726d7..2aea9a4 100644
--- a/datapath-windows/ovsext/Flow.c
+++ b/datapath-windows/ovsext/Flow.c
@@ -254,7 +254,7 @@  OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
     PNL_MSG_HDR nlMsgHdr = &(msgIn->nlMsg);
     PGENL_MSG_HDR genlMsgHdr = &(msgIn->genlMsg);
     POVS_HDR ovsHdr = &(msgIn->ovsHdr);
-    PNL_ATTR nlAttrs[__OVS_FLOW_ATTR_MAX];
+    PNL_ATTR flowAttrs[__OVS_FLOW_ATTR_MAX];
     UINT32 attrOffset = NLMSG_HDRLEN + GENL_HDRLEN + OVS_HDRLEN;
     OvsFlowPut mappedFlow;
     OvsFlowStats stats;
@@ -275,7 +275,7 @@  OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
     /* Get all the top level Flow attributes */
     if ((NlAttrParse(nlMsgHdr, attrOffset, NlMsgAttrsLen(nlMsgHdr),
                      nlFlowPolicy, ARRAY_SIZE(nlFlowPolicy),
-                     nlAttrs, ARRAY_SIZE(nlAttrs)))
+                     flowAttrs, ARRAY_SIZE(flowAttrs)))
                      != TRUE) {
         OVS_LOG_ERROR("Attr Parsing failed for msg: %p",
                        nlMsgHdr);
@@ -285,7 +285,7 @@  OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
 
     /* FLOW_DEL command w/o any key input is a flush case. */
     if ((genlMsgHdr->cmd == OVS_FLOW_CMD_DEL) &&
-        (!(nlAttrs[OVS_FLOW_ATTR_KEY]))) {
+        (!(flowAttrs[OVS_FLOW_ATTR_KEY]))) {
 
         rc = OvsFlushFlowIoctl(ovsHdr->dp_ifindex);
 
@@ -315,8 +315,8 @@  OvsFlowNlCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
         goto done;
     }
 
-    if ((rc = _MapNlToFlowPut(msgIn, nlAttrs[OVS_FLOW_ATTR_KEY],
-         nlAttrs[OVS_FLOW_ATTR_ACTIONS], nlAttrs[OVS_FLOW_ATTR_CLEAR],
+    if ((rc = _MapNlToFlowPut(msgIn, flowAttrs[OVS_FLOW_ATTR_KEY],
+         flowAttrs[OVS_FLOW_ATTR_ACTIONS], flowAttrs[OVS_FLOW_ATTR_CLEAR],
          &mappedFlow))
         != STATUS_SUCCESS) {
         OVS_LOG_ERROR("Conversion to OvsFlowPut failed");