X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=secchan%2Fsecchan.c;h=d1df8283dedfe21b74226d552e7ffb27a3e64c80;hb=2c775287e298648ac695df4e66cffe99f1b497c1;hp=42e99da254888967124c9f74063102235e37d7e1;hpb=eda13285783d788d08e4911f44730829aaadd433;p=openvswitch diff --git a/secchan/secchan.c b/secchan/secchan.c index 42e99da2..d1df8283 100644 --- a/secchan/secchan.c +++ b/secchan/secchan.c @@ -810,7 +810,7 @@ struct rate_limiter { struct rconn *remote_rconn; /* One queue per physical port. */ - struct queue queues[OFPP_MAX]; + struct ofp_queue queues[OFPP_MAX]; int n_queued; /* Sum over queues[*].n. */ int next_tx_port; /* Next port to check in round-robin. */ @@ -837,9 +837,9 @@ struct rate_limiter { static void drop_packet(struct rate_limiter *rl) { - struct queue *longest; /* Queue currently selected as longest. */ + struct ofp_queue *longest; /* Queue currently selected as longest. */ int n_longest; /* # of queues of same length as 'longest'. */ - struct queue *q; + struct ofp_queue *q; longest = &rl->queues[0]; n_longest = 1; @@ -871,7 +871,7 @@ dequeue_packet(struct rate_limiter *rl) for (i = 0; i < OFPP_MAX; i++) { unsigned int port = (rl->next_tx_port + i) % OFPP_MAX; - struct queue *q = &rl->queues[port]; + struct ofp_queue *q = &rl->queues[port]; if (q->n) { rl->next_tx_port = (port + 1) % OFPP_MAX; rl->n_queued--;