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
netdev: Add 'change_seq' back to netdev.
[sliver-openvswitch.git]
/
lib
/
netdev-dummy.c
diff --git
a/lib/netdev-dummy.c
b/lib/netdev-dummy.c
index
784eff4
..
501fb82
100644
(file)
--- a/
lib/netdev-dummy.c
+++ b/
lib/netdev-dummy.c
@@
-20,7
+20,6
@@
#include <errno.h>
#include <errno.h>
-#include "connectivity.h"
#include "dpif-netdev.h"
#include "flow.h"
#include "list.h"
#include "dpif-netdev.h"
#include "flow.h"
#include "list.h"
@@
-32,7
+31,6
@@
#include "packets.h"
#include "pcap-file.h"
#include "poll-loop.h"
#include "packets.h"
#include "pcap-file.h"
#include "poll-loop.h"
-#include "seq.h"
#include "shash.h"
#include "sset.h"
#include "stream.h"
#include "shash.h"
#include "sset.h"
#include "stream.h"
@@
-198,11
+196,11
@@
dummy_packet_stream_run(struct netdev_dummy *dev, struct dummy_packet_stream *s)
int retval;
txbuf = ofpbuf_from_list(list_front(&s->txq));
int retval;
txbuf = ofpbuf_from_list(list_front(&s->txq));
- retval = stream_send(s->stream,
txbuf->data, txbuf->size
);
+ retval = stream_send(s->stream,
ofpbuf_data(txbuf), ofpbuf_size(txbuf)
);
if (retval > 0) {
ofpbuf_pull(txbuf, retval);
if (retval > 0) {
ofpbuf_pull(txbuf, retval);
- if (!
txbuf->size
) {
+ if (!
ofpbuf_size(txbuf)
) {
list_remove(&txbuf->list_node);
ofpbuf_delete(txbuf);
}
list_remove(&txbuf->list_node);
ofpbuf_delete(txbuf);
}
@@
-212,17
+210,17
@@
dummy_packet_stream_run(struct netdev_dummy *dev, struct dummy_packet_stream *s)
}
if (!error) {
}
if (!error) {
- if (
s->rxbuf.size
< 2) {
- n = 2 -
s->rxbuf.size
;
+ if (
ofpbuf_size(&s->rxbuf)
< 2) {
+ n = 2 -
ofpbuf_size(&s->rxbuf)
;
} else {
uint16_t frame_len;
} else {
uint16_t frame_len;
- frame_len = ntohs(get_unaligned_be16(
s->rxbuf.data
));
+ frame_len = ntohs(get_unaligned_be16(
ofpbuf_data(&s->rxbuf)
));
if (frame_len < ETH_HEADER_LEN) {
error = EPROTO;
n = 0;
} else {
if (frame_len < ETH_HEADER_LEN) {
error = EPROTO;
n = 0;
} else {
- n = (2 + frame_len) -
s->rxbuf.size
;
+ n = (2 + frame_len) -
ofpbuf_size(&s->rxbuf)
;
}
}
}
}
}
}
@@
-233,8
+231,8
@@
dummy_packet_stream_run(struct netdev_dummy *dev, struct dummy_packet_stream *s)
retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
if (retval > 0) {
retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
if (retval > 0) {
-
s->rxbuf.size += retval
;
- if (retval == n &&
s->rxbuf.size
> 2) {
+
ofpbuf_set_size(&s->rxbuf, ofpbuf_size(&s->rxbuf) + retval)
;
+ if (retval == n &&
ofpbuf_size(&s->rxbuf)
> 2) {
ofpbuf_pull(&s->rxbuf, 2);
netdev_dummy_queue_packet(dev,
ofpbuf_clone(&s->rxbuf));
ofpbuf_pull(&s->rxbuf, 2);
netdev_dummy_queue_packet(dev,
ofpbuf_clone(&s->rxbuf));
@@
-242,7
+240,7
@@
dummy_packet_stream_run(struct netdev_dummy *dev, struct dummy_packet_stream *s)
}
} else if (retval != -EAGAIN) {
error = (retval < 0 ? -retval
}
} else if (retval != -EAGAIN) {
error = (retval < 0 ? -retval
- :
s->rxbuf.size
? EPROTO
+ :
ofpbuf_size(&s->rxbuf)
? EPROTO
: EOF);
}
}
: EOF);
}
}
@@
-776,7
+774,7
@@
netdev_dummy_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **arr, int *c)
}
ovs_mutex_lock(&netdev->mutex);
netdev->stats.rx_packets++;
}
ovs_mutex_lock(&netdev->mutex);
netdev->stats.rx_packets++;
- netdev->stats.rx_bytes +=
packet->size
;
+ netdev->stats.rx_bytes +=
ofpbuf_size(packet)
;
ovs_mutex_unlock(&netdev->mutex);
dp_packet_pad(packet);
ovs_mutex_unlock(&netdev->mutex);
dp_packet_pad(packet);
@@
-821,8
+819,8
@@
static int
netdev_dummy_send(struct netdev *netdev, struct ofpbuf *pkt, bool may_steal)
{
struct netdev_dummy *dev = netdev_dummy_cast(netdev);
netdev_dummy_send(struct netdev *netdev, struct ofpbuf *pkt, bool may_steal)
{
struct netdev_dummy *dev = netdev_dummy_cast(netdev);
- const void *buffer =
pkt->data
;
- size_t size =
pkt->size
;
+ const void *buffer =
ofpbuf_data(pkt)
;
+ size_t size =
ofpbuf_size(pkt)
;
if (size < ETH_HEADER_LEN) {
return EMSGSIZE;
if (size < ETH_HEADER_LEN) {
return EMSGSIZE;
@@
-873,7
+871,7
@@
netdev_dummy_set_etheraddr(struct netdev *netdev,
ovs_mutex_lock(&dev->mutex);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
ovs_mutex_lock(&dev->mutex);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
-
seq_change(connectivity_seq_get()
);
+
netdev_change_seq_changed(netdev
);
}
ovs_mutex_unlock(&dev->mutex);
}
ovs_mutex_unlock(&dev->mutex);
@@
-968,7
+966,7
@@
netdev_dummy_update_flags__(struct netdev_dummy *netdev,
netdev->flags |= on;
netdev->flags &= ~off;
if (*old_flagsp != netdev->flags) {
netdev->flags |= on;
netdev->flags &= ~off;
if (*old_flagsp != netdev->flags) {
-
seq_change(connectivity_seq_get()
);
+
netdev_change_seq_changed(&netdev->up
);
}
return 0;
}
return 0;
@@
-1082,7
+1080,7
@@
eth_from_packet_or_flow(const char *s)
}
/* Convert odp_key to flow. */
}
/* Convert odp_key to flow. */
- fitness = odp_flow_key_to_flow(o
dp_key.data, odp_key.size
, &flow);
+ fitness = odp_flow_key_to_flow(o
fpbuf_data(&odp_key), ofpbuf_size(&odp_key)
, &flow);
if (fitness == ODP_FIT_ERROR) {
ofpbuf_uninit(&odp_key);
return NULL;
if (fitness == ODP_FIT_ERROR) {
ofpbuf_uninit(&odp_key);
return NULL;