diff options
author | Ben Pfaff <blp@nicira.com> | 2013-05-28 11:23:29 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2013-05-28 15:39:55 -0700 |
commit | 323cc924088d7d99d1868892dc48ba2c8e8cf2d0 (patch) | |
tree | d08d8e839c6af06d0b2c36ed7c8068ab34acb123 /lib/netdev-dummy.c | |
parent | 2273ea5ab910832b51247b641b2546e221133633 (diff) |
netdev-dummy: Drop "nobody listened" reply from netdev-dummy/receive.
Ethan pointed out that this wasn't very useful.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/netdev-dummy.c')
-rw-r--r-- | lib/netdev-dummy.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index ad35fb7e..58a4535e 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -435,24 +435,19 @@ eth_from_packet_or_flow(const char *s) return packet; } -static int +static void netdev_dummy_queue_packet(struct netdev_dummy *dummy, const void *data, size_t size) { struct netdev_rx_dummy *rx; - int n_listeners; - n_listeners = 0; LIST_FOR_EACH (rx, node, &dummy->rxes) { if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) { struct ofpbuf *copy = ofpbuf_clone_data(data, size); list_push_back(&rx->recv_queue, ©->list_node); rx->recv_queue_len++; - n_listeners++; } } - - return n_listeners; } static void @@ -460,7 +455,6 @@ netdev_dummy_receive(struct unixctl_conn *conn, int argc, const char *argv[], void *aux OVS_UNUSED) { struct netdev_dummy *dummy_dev; - int n_listeners; int i; dummy_dev = shash_find_data(&dummy_netdevs, argv[1]); @@ -469,7 +463,6 @@ netdev_dummy_receive(struct unixctl_conn *conn, return; } - n_listeners = 0; for (i = 2; i < argc; i++) { struct ofpbuf *packet; @@ -482,16 +475,11 @@ netdev_dummy_receive(struct unixctl_conn *conn, dummy_dev->stats.rx_packets++; dummy_dev->stats.rx_bytes += packet->size; - n_listeners += netdev_dummy_queue_packet(dummy_dev, - packet->data, packet->size); + netdev_dummy_queue_packet(dummy_dev, packet->data, packet->size); ofpbuf_delete(packet); } - if (!n_listeners) { - unixctl_command_reply(conn, "packets queued but nobody listened"); - } else { - unixctl_command_reply(conn, "success"); - } + unixctl_command_reply(conn, NULL); } static void |