X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fin-band.c;h=a001baf6a87472f762fe5e173d370ca2edbd97b7;hb=1ce0a5fa82f1a0013dd62713d16fde973b029eb7;hp=952ff8b152566e4c7ecb631f169f2ef4758bc4c7;hpb=130f6e5faa6190ca00000ebcb627e2d4ca3d4b37;p=openvswitch

diff --git a/ofproto/in-band.c b/ofproto/in-band.c
index 952ff8b1..a001baf6 100644
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.c
@@ -35,15 +35,14 @@
 #include "openflow/openflow.h"
 #include "packets.h"
 #include "poll-loop.h"
-#include "status.h"
 #include "timeval.h"
 #include "vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(in_band);
 
-/* In-band control allows a single network to be used for OpenFlow
- * traffic and other data traffic.  Refer to ovs-vswitchd.conf(5) and
- * secchan(8) for a description of configuring in-band control.
+/* In-band control allows a single network to be used for OpenFlow traffic and
+ * other data traffic.  See ovs-vswitchd.conf.db(5) for a description of
+ * configuring in-band control.
  *
  * This comment is an attempt to describe how in-band control works at a
  * wire- and implementation-level.  Correctly implementing in-band
@@ -235,7 +234,6 @@ struct in_band_remote {
 
 struct in_band {
     struct ofproto *ofproto;
-    struct status_category *ss_cat;
     int queue_id, prev_queue_id;
 
     /* Remote information. */
@@ -373,23 +371,6 @@ refresh_local(struct in_band *ib)
     return true;
 }
 
-static void
-in_band_status_cb(struct status_reply *sr, void *in_band_)
-{
-    struct in_band *in_band = in_band_;
-
-    if (!eth_addr_is_zero(in_band->local_mac)) {
-        status_reply_put(sr, "local-mac="ETH_ADDR_FMT,
-                         ETH_ADDR_ARGS(in_band->local_mac));
-    }
-
-    if (in_band->n_remotes
-        && !eth_addr_is_zero(in_band->remotes[0].remote_mac)) {
-        status_reply_put(sr, "remote-mac="ETH_ADDR_FMT,
-                         ETH_ADDR_ARGS(in_band->remotes[0].remote_mac));
-    }
-}
-
 /* Returns true if 'packet' should be sent to the local port regardless
  * of the flow table. */
 bool
@@ -704,7 +685,7 @@ in_band_flushed(struct in_band *in_band)
 
 int
 in_band_create(struct ofproto *ofproto, struct dpif *dpif,
-               struct switch_status *ss, struct in_band **in_bandp)
+               struct in_band **in_bandp)
 {
     struct in_band *in_band;
     char local_name[IF_NAMESIZE];
@@ -729,8 +710,6 @@ in_band_create(struct ofproto *ofproto, struct dpif *dpif,
 
     in_band = xzalloc(sizeof *in_band);
     in_band->ofproto = ofproto;
-    in_band->ss_cat = switch_status_register(ss, "in-band",
-                                             in_band_status_cb, in_band);
     in_band->queue_id = in_band->prev_queue_id = -1;
     in_band->next_remote_refresh = TIME_MIN;
     in_band->next_local_refresh = TIME_MIN;
@@ -747,7 +726,6 @@ in_band_destroy(struct in_band *ib)
     if (ib) {
         drop_rules(ib);
         in_band_set_remotes(ib, NULL, 0);
-        switch_status_unregister(ib->ss_cat);
         netdev_close(ib->local_netdev);
         free(ib);
     }