list_init(&s->txq);
} else if (error != EAGAIN) {
VLOG_WARN("%s: accept failed (%s)",
- pstream_get_name(dev->pstream), strerror(error));
+ pstream_get_name(dev->pstream), ovs_strerror(error));
pstream_close(dev->pstream);
dev->pstream = NULL;
}
netdev_dummy_create(const struct netdev_class *class, const char *name,
struct netdev **netdevp)
{
- static unsigned int n = 0xaa550000;
+ static atomic_uint next_n = ATOMIC_VAR_INIT(0xaa550000);
struct netdev_dummy *netdev;
+ unsigned int n;
+ atomic_add(&next_n, 1, &n);
netdev = xzalloc(sizeof *netdev);
netdev_init(&netdev->up, name, class);
netdev->hwaddr[0] = 0xaa;
shash_add(&dummy_netdevs, name, netdev);
- n++;
-
*netdevp = &netdev->up;
return 0;
error = pstream_open(pstream, &netdev->pstream, DSCP_DEFAULT);
if (error) {
- VLOG_WARN("%s: open failed (%s)", pstream, strerror(error));
+ VLOG_WARN("%s: open failed (%s)",
+ pstream, ovs_strerror(error));
}
}
}
{
struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
struct ofpbuf *packet;
- size_t packet_size;
+ int retval;
if (list_is_empty(&rx->recv_queue)) {
return -EAGAIN;
packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
rx->recv_queue_len--;
- if (packet->size > size) {
- return -EMSGSIZE;
+ if (packet->size <= size) {
+ memcpy(buffer, packet->data, packet->size);
+ retval = packet->size;
+ } else {
+ retval = -EMSGSIZE;
}
- packet_size = packet->size;
-
- memcpy(buffer, packet->data, packet->size);
ofpbuf_delete(packet);
- return packet_size;
+ return retval;
}
static void