From: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Date: Fri, 10 May 2013 19:54:35 +0000 (+0300)
Subject: meta-flow: Simplify mf_from_ofp_port_string()
X-Git-Tag: sliver-openvswitch-1.10.90-3~13^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=33ab38d9b861ab07fc4a291b77ce426bb3a1609e;p=sliver-openvswitch.git

meta-flow: Simplify mf_from_ofp_port_string()

ofputil_port_from_string() does all the work already.

Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index c3f198cd3..16850ec35 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -2168,17 +2168,13 @@ mf_from_ofp_port_string(const struct mf_field *mf, const char *s,
     uint16_t port;
 
     ovs_assert(mf->n_bytes == sizeof(ovs_be16));
-    if (*s == '-') {
-        return xasprintf("%s: negative values not supported for %s",
-                         s, mf->name);
-    } else if (ofputil_port_from_string(s, &port)) {
+
+    if (ofputil_port_from_string(s, &port)) {
         *valuep = htons(port);
         *maskp = htons(UINT16_MAX);
         return NULL;
-    } else {
-        return mf_from_integer_string(mf, s,
-                                      (uint8_t *) valuep, (uint8_t *) maskp);
     }
+    return xasprintf("%s: port value out of range for %s", s, mf->name);
 }
 
 struct frag_handling {