From: Jesse Gross Date: Fri, 18 Jun 2010 17:24:28 +0000 (-0700) Subject: ofproto: Consistently make queue_id uint32_t. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db9220c38ee6fd3ff264807e4c32065e5de5140f;p=openvswitch ofproto: Consistently make queue_id uint32_t. In some places queue_id was a uint16_t which caused issues when comparing to 32-bit constants and doing byte swaps. --- diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 5232cfad..4c4df949 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -3198,7 +3198,7 @@ struct queue_stats_cbdata { }; static void -put_queue_stats(struct queue_stats_cbdata *cbdata, uint16_t queue_id, +put_queue_stats(struct queue_stats_cbdata *cbdata, uint32_t queue_id, const struct netdev_queue_stats *stats) { struct ofp_queue_stats *reply; @@ -3213,7 +3213,7 @@ put_queue_stats(struct queue_stats_cbdata *cbdata, uint16_t queue_id, } static void -handle_queue_stats_dump_cb(unsigned int queue_id, +handle_queue_stats_dump_cb(uint32_t queue_id, struct netdev_queue_stats *stats, void *cbdata_) { @@ -3224,7 +3224,7 @@ handle_queue_stats_dump_cb(unsigned int queue_id, static void handle_queue_stats_for_port(struct ofport *port, uint16_t port_no, - uint16_t queue_id, + uint32_t queue_id, struct queue_stats_cbdata *cbdata) { cbdata->port_no = port_no;