git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofpbuf: Rename ofpbuf "private" member for C++ header compatibility.
[sliver-openvswitch.git]
/
lib
/
rconn.c
diff --git
a/lib/rconn.c
b/lib/rconn.c
index
2cbe43e
..
35f42e4
100644
(file)
--- a/
lib/rconn.c
+++ b/
lib/rconn.c
@@
-547,7
+547,7
@@
rconn_send(struct rconn *rc, struct ofpbuf *b,
if (rconn_is_connected(rc)) {
COVERAGE_INC(rconn_queued);
copy_to_monitor(rc, b);
if (rconn_is_connected(rc)) {
COVERAGE_INC(rconn_queued);
copy_to_monitor(rc, b);
- b->private = counter;
+ b->private
_p
= counter;
if (counter) {
rconn_packet_counter_inc(counter);
}
if (counter) {
rconn_packet_counter_inc(counter);
}
@@
-845,7
+845,7
@@
try_send(struct rconn *rc)
{
int retval = 0;
struct ofpbuf *next = rc->txq.head->next;
{
int retval = 0;
struct ofpbuf *next = rc->txq.head->next;
- struct rconn_packet_counter *counter = rc->txq.head->private;
+ struct rconn_packet_counter *counter = rc->txq.head->private
_p
;
retval = vconn_send(rc->vconn, rc->txq.head);
if (retval) {
if (retval != EAGAIN) {
retval = vconn_send(rc->vconn, rc->txq.head);
if (retval) {
if (retval != EAGAIN) {
@@
-914,7
+914,7
@@
flush_queue(struct rconn *rc)
}
while (rc->txq.n > 0) {
struct ofpbuf *b = queue_pop_head(&rc->txq);
}
while (rc->txq.n > 0) {
struct ofpbuf *b = queue_pop_head(&rc->txq);
- struct rconn_packet_counter *counter = b->private;
+ struct rconn_packet_counter *counter = b->private
_p
;
if (counter) {
rconn_packet_counter_dec(counter);
}
if (counter) {
rconn_packet_counter_dec(counter);
}