secchan: Fix cut-and-paste errors in port speed determination.
authorBen Pfaff <blp@nicira.com>
Wed, 31 Dec 2008 23:59:39 +0000 (15:59 -0800)
committerBen Pfaff <blp@nicira.com>
Wed, 31 Dec 2008 23:59:39 +0000 (15:59 -0800)
secchan/port-watcher.c
secchan/stp-secchan.c

index 2109bdac687588d1bd567ec796586f0dd0d89ccb..7daa370e73e7c8070519a7de0dbb34738153ce19 100644 (file)
@@ -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");
         }
index 379bca2652448ce262ee4d48b02097ff8c33532f..97ad02bbc1b658929edbcbf9e3721b6646cd4ee5 100644 (file)
@@ -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);