ofproto: Add OFPC_QUEUE_STATS to switch feature reply.

Open vSwitch has supported queue stats for a long time, but we forgot to
set the OFPC_QUEUE_STATS bit in the switch features reply to show that they
are supported.  This fixes it.

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 7543e1140bbc1958b06b99407a62fcb14846cfcc..9a302d54f0efc92652486f5fac14d66d799e91df 100644 (file)
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -1647,7 +1647,7 @@ handle_features_request(struct ofconn *ofconn, const struct ofp_header *oh)
     osf->n_buffers = htonl(pktbuf_capacity());
     osf->n_tables = ofproto->n_tables;
     osf->capabilities = htonl(OFPC_FLOW_STATS | OFPC_TABLE_STATS |
-                              OFPC_PORT_STATS);
+                              OFPC_PORT_STATS | OFPC_QUEUE_STATS);
     if (arp_match_ip) {
         osf->capabilities |= htonl(OFPC_ARP_MATCH_IP);
     }

diff --git a/tests/ofproto.at b/tests/ofproto.at
index 71cfb1415c9cccb7882fe2088c5c3ad7e1ca1b77..e430800b4db4219f79fe57c283e19feb0bc82aa8 100644 (file)
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -12,7 +12,7 @@ AT_CHECK([ovs-ofctl -vANY:ANY:WARN show br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPT_FEATURES_REPLY: ver:0x1, dpid:fedcba9876543210
 n_tables:255, n_buffers:256
-features: capabilities:0x87, actions:0xfff
+features: capabilities:0xc7, actions:0xfff
  LOCAL(br0): addr:aa:55:aa:55:00:00
      config:     PORT_DOWN
      state:      LINK_DOWN
@@ -60,7 +60,7 @@ do
     AT_CHECK_UNQUOTED([STRIP_XIDS stdout], [0], [dnl
 OFPT_FEATURES_REPLY: ver:0x1, dpid:fedcba9876543210
 n_tables:255, n_buffers:256
-features: capabilities:0x87, actions:0xfff
+features: capabilities:0xc7, actions:0xfff
  LOCAL(br0): addr:aa:55:aa:55:00:00
      config:     $config
      state:      $state