projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename struct queue to struct ofp_queue.
[openvswitch]
/
secchan
/
secchan.c
diff --git
a/secchan/secchan.c
b/secchan/secchan.c
index 42e99da254888967124c9f74063102235e37d7e1..d1df8283dedfe21b74226d552e7ffb27a3e64c80 100644
(file)
--- 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 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. */
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)
{
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'. */
int n_longest; /* # of queues of same length as 'longest'. */
- struct queue *q;
+ struct
ofp_
queue *q;
longest = &rl->queues[0];
n_longest = 1;
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;
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--;
if (q->n) {
rl->next_tx_port = (port + 1) % OFPP_MAX;
rl->n_queued--;