ofproto: Move hton_ofp_phy_port() to ofp-util.

This removes some code from ofproto.c that doesn't really seem to
belong there to begin with.

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index e42abc50f9a630135a956042e3ba425069661fe5..d91fbb11fe1e287a2bd6c9bd5128e6f467b2ceab 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -1863,6 +1863,19 @@ make_echo_reply(const struct ofp_header *rq)
     return out;
 }
 
+/* Converts the members of 'opp' from host to network byte order. */
+void
+hton_ofp_phy_port(struct ofp_phy_port *opp)
+{
+    opp->port_no = htons(opp->port_no);
+    opp->config = htonl(opp->config);
+    opp->state = htonl(opp->state);
+    opp->curr = htonl(opp->curr);
+    opp->advertised = htonl(opp->advertised);
+    opp->supported = htonl(opp->supported);
+    opp->peer = htonl(opp->peer);
+}
+
 const struct ofp_flow_stats *
 flow_stats_first(struct flow_stats_iterator *iter,
                  const struct ofp_stats_reply *osr)

diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index b4fe642388fdc056e34b903ff3d24c043bbd71e6..75e76e24ccca95c17e415d108978d4e30aaf21a3 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -257,6 +257,8 @@ struct ofpbuf *make_unbuffered_packet_out(const struct ofpbuf *packet,
 struct ofpbuf *make_echo_request(void);
 struct ofpbuf *make_echo_reply(const struct ofp_header *rq);
 
+void hton_ofp_phy_port(struct ofp_phy_port *);
+
 struct flow_stats_iterator {
     const uint8_t *pos, *end;
 };

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 699985cf3e6cedaeb140e8facd2d405d65e988d5..bd81a55682a2822ed5d51a9371a814307b2ea921 100644 (file)
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -107,7 +107,6 @@ struct ofport {
 static void ofport_free(struct ofport *);
 static void ofport_run(struct ofproto *, struct ofport *);
 static void ofport_wait(struct ofport *);
-static void hton_ofp_phy_port(struct ofp_phy_port *);
 
 struct action_xlate_ctx {
 /* action_xlate_ctx_init() initializes these members. */
@@ -2633,18 +2632,6 @@ send_error_oh(const struct ofconn *ofconn, const struct ofp_header *oh,
     }
 }
 
-static void
-hton_ofp_phy_port(struct ofp_phy_port *opp)
-{
-    opp->port_no = htons(opp->port_no);
-    opp->config = htonl(opp->config);
-    opp->state = htonl(opp->state);
-    opp->curr = htonl(opp->curr);
-    opp->advertised = htonl(opp->advertised);
-    opp->supported = htonl(opp->supported);
-    opp->peer = htonl(opp->peer);
-}
-
 static int
 handle_echo_request(struct ofconn *ofconn, const struct ofp_header *oh)
 {