ovsdb-client: Improve HTML output.

[openvswitch] / ofproto / ofproto-sflow.c

diff --git a/ofproto/ofproto-sflow.c b/ofproto/ofproto-sflow.c
index b37db42d049c45fd49e0e3ffce677a770dfc0d71..45372003dd16b5dc4c6c941f09e57e78616050e7 100644 (file)
--- a/ofproto/ofproto-sflow.c
+++ b/ofproto/ofproto-sflow.c
@@ -96,14 +96,16 @@ ofproto_sflow_options_destroy(struct ofproto_sflow_options *options)
 
 /* sFlow library callback to allocate memory. */
 static void *
-sflow_agent_alloc_cb(void *magic UNUSED, SFLAgent *agent UNUSED, size_t bytes)
+sflow_agent_alloc_cb(void *magic OVS_UNUSED, SFLAgent *agent OVS_UNUSED,
+                     size_t bytes)
 {
     return calloc(1, bytes);
 }
 
 /* sFlow library callback to free memory. */
 static int
-sflow_agent_free_cb(void *magic UNUSED, SFLAgent *agent UNUSED, void *obj)
+sflow_agent_free_cb(void *magic OVS_UNUSED, SFLAgent *agent OVS_UNUSED,
+                    void *obj)
 {
     free(obj);
     return 0;
@@ -111,15 +113,16 @@ sflow_agent_free_cb(void *magic UNUSED, SFLAgent *agent UNUSED, void *obj)
 
 /* sFlow library callback to report error. */
 static void
-sflow_agent_error_cb(void *magic UNUSED, SFLAgent *agent UNUSED, char *msg)
+sflow_agent_error_cb(void *magic OVS_UNUSED, SFLAgent *agent OVS_UNUSED,
+                     char *msg)
 {
     VLOG_WARN("sFlow agent error: %s", msg);
 }
 
 /* sFlow library callback to send datagram. */
 static void
-sflow_agent_send_packet_cb(void *os_, SFLAgent *agent UNUSED,
-                           SFLReceiver *receiver UNUSED, u_char *pkt,
+sflow_agent_send_packet_cb(void *os_, SFLAgent *agent OVS_UNUSED,
+                           SFLReceiver *receiver OVS_UNUSED, u_char *pkt,
                            uint32_t pktLen)
 {
     struct ofproto_sflow *os = os_;
@@ -212,7 +215,7 @@ sflow_choose_agent_address(const char *agent_device, const char *control_ip,
     if (agent_device) {
         struct netdev *netdev;
 
-        if (!netdev_open(agent_device, NETDEV_ETH_TYPE_NONE, &netdev)) {
+        if (!netdev_open_default(agent_device, &netdev)) {
             int error = netdev_get_in4(netdev, &in4, NULL);
             netdev_close(netdev);
             if (!error) {
@@ -319,7 +322,7 @@ ofproto_sflow_add_port(struct ofproto_sflow *os, uint16_t odp_port,
     ofproto_sflow_del_port(os, odp_port);
 
     /* Open network device. */
-    error = netdev_open(netdev_name, NETDEV_ETH_TYPE_NONE, &netdev);
+    error = netdev_open_default(netdev_name, &netdev);
     if (error) {
         VLOG_WARN_RL(&rl, "failed to open network device \"%s\": %s",
                      netdev_name, strerror(error));
@@ -367,7 +370,6 @@ ofproto_sflow_set_options(struct ofproto_sflow *os,
     unsigned int odp_port;
     SFLAddress agentIP;
     time_t now;
-    int error;
 
     if (!options->targets.n || !options->sampling_rate) {
         /* No point in doing any work if there are no targets or nothing to
@@ -385,8 +387,8 @@ ofproto_sflow_set_options(struct ofproto_sflow *os,
     if (options_changed
         || collectors_count(os->collectors) < options->targets.n) {
         collectors_destroy(os->collectors);
-        error = collectors_create(&options->targets,
-                                  SFL_DEFAULT_COLLECTOR_PORT, &os->collectors);
+        collectors_create(&options->targets, SFL_DEFAULT_COLLECTOR_PORT,
+                          &os->collectors);
         if (os->collectors == NULL) {
             VLOG_WARN_RL(&rl, "no collectors could be initialized, "
                          "sFlow disabled");