From: Ben Pfaff <blp@nicira.com>
Date: Wed, 31 Dec 2008 23:59:39 +0000 (-0800)
Subject: secchan: Fix cut-and-paste errors in port speed determination.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5aeadf8a6260a6e95799fe8eefe60be4f174d0a;p=openvswitch

secchan: Fix cut-and-paste errors in port speed determination.
---

diff --git a/secchan/port-watcher.c b/secchan/port-watcher.c
index 2109bdac..7daa370e 100644
--- a/secchan/port-watcher.c
+++ b/secchan/port-watcher.c
@@ -332,7 +332,7 @@ put_features(struct ds *ds, const char *name, uint32_t features)
         put_duplexes(ds, "10M", features, OFPPF_10MB_HD, OFPPF_10MB_FD);
         put_duplexes(ds, "100M", features,
                      OFPPF_100MB_HD, OFPPF_100MB_FD);
-        put_duplexes(ds, "1G", features, OFPPF_100MB_HD, OFPPF_100MB_FD);
+        put_duplexes(ds, "1G", features, OFPPF_1GB_HD, OFPPF_1GB_FD);
         if (features & OFPPF_10GB_FD) {
             ds_put_cstr(ds, " 10G");
         }
diff --git a/secchan/stp-secchan.c b/secchan/stp-secchan.c
index 379bca26..97ad02bb 100644
--- a/secchan/stp-secchan.c
+++ b/secchan/stp-secchan.c
@@ -270,7 +270,7 @@ stp_port_changed_cb(uint16_t port_no,
             speed = 100;
         } else if (new->curr & (OFPPF_1GB_HD | OFPPF_1GB_FD)) {
             speed = 1000;
-        } else if (new->curr & OFPPF_100MB_FD) {
+        } else if (new->curr & OFPPF_10GB_FD) {
             speed = 10000;
         }
         stp_port_set_speed(p, speed);