From: Ben Pfaff <blp@nicira.com>
Date: Fri, 15 Feb 2013 19:24:27 +0000 (-0800)
Subject: dpif-linux: Fix byte-swapping direction in nl_msg_put_u16() call.
X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7e2d8aeaf5ef25408a6f345e2611b647851e0120;p=sliver-openvswitch.git

dpif-linux: Fix byte-swapping direction in nl_msg_put_u16() call.

OVS_TUNNEL_ATTR_DST_PORT expects a u16, tnl_cfg->dst_port is a be16, so
we want ntohs() instead of htons().

In practice htons() and ntohs() perform the same operation, so this does
not fix a real bug.

Found by sparse.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 3cf1225ff..aa1739d0a 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -521,7 +521,7 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,
     if (tnl_cfg && tnl_cfg->dst_port != 0) {
         ofpbuf_use_stack(&options, options_stub, sizeof options_stub);
         nl_msg_put_u16(&options, OVS_TUNNEL_ATTR_DST_PORT,
-                       htons(tnl_cfg->dst_port));
+                       ntohs(tnl_cfg->dst_port));
         request.options = options.data;
         request.options_len = options.size;
     }