projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-data: New function ovsdb_datum_from_shash().
[openvswitch]
/
lib
/
dpif-linux.c
diff --git
a/lib/dpif-linux.c
b/lib/dpif-linux.c
index af6eee4161c9abc73b3429854cf230b73ec88a9b..635fe94111df4c97ba473746024743b7c37faad9 100644
(file)
--- a/
lib/dpif-linux.c
+++ b/
lib/dpif-linux.c
@@
-25,6
+25,7
@@
#include <net/if.h>
#include <linux/types.h>
#include <linux/ethtool.h>
#include <net/if.h>
#include <linux/types.h>
#include <linux/ethtool.h>
+#include <linux/pkt_sched.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
#include <stdlib.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
#include <stdlib.h>
@@
-40,9
+41,9
@@
#include "shash.h"
#include "svec.h"
#include "util.h"
#include "shash.h"
#include "svec.h"
#include "util.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_dpif_linux
+
+VLOG_DEFINE_THIS_MODULE(dpif_linux)
/* Datapath interface for the openvswitch Linux kernel module. */
struct dpif_linux {
/* Datapath interface for the openvswitch Linux kernel module. */
struct dpif_linux {
@@
-337,8
+338,7
@@
dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep)
return ENOBUFS;
} else if (!shash_is_empty(&dpif->changed_ports)) {
struct shash_node *node = shash_first(&dpif->changed_ports);
return ENOBUFS;
} else if (!shash_is_empty(&dpif->changed_ports)) {
struct shash_node *node = shash_first(&dpif->changed_ports);
- *devnamep = xstrdup(node->name);
- shash_delete(&dpif->changed_ports, node);
+ *devnamep = shash_steal(&dpif->changed_ports, node);
return 0;
} else {
return EAGAIN;
return 0;
} else {
return EAGAIN;
@@
-457,6
+457,18
@@
dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability)
return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability);
}
return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability);
}
+static int
+dpif_linux_queue_to_priority(const struct dpif *dpif OVS_UNUSED,
+ uint32_t queue_id, uint32_t *priority)
+{
+ if (queue_id < 0xf000) {
+ *priority = TC_H_MAKE(1 << 16, queue_id + 1);
+ return 0;
+ } else {
+ return EINVAL;
+ }
+}
+
static int
dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
{
static int
dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
{
@@
-465,8
+477,7
@@
dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
int retval;
int error;
int retval;
int error;
- buf = ofpbuf_new(65536 + DPIF_RECV_MSG_PADDING);
- ofpbuf_reserve(buf, DPIF_RECV_MSG_PADDING);
+ buf = ofpbuf_new_with_headroom(65536, DPIF_RECV_MSG_PADDING);
retval = read(dpif->fd, ofpbuf_tail(buf), ofpbuf_tailroom(buf));
if (retval < 0) {
error = errno;
retval = read(dpif->fd, ofpbuf_tail(buf), ofpbuf_tailroom(buf));
if (retval < 0) {
error = errno;
@@
-539,6
+550,7
@@
const struct dpif_class dpif_linux_class = {
dpif_linux_recv_set_mask,
dpif_linux_get_sflow_probability,
dpif_linux_set_sflow_probability,
dpif_linux_recv_set_mask,
dpif_linux_get_sflow_probability,
dpif_linux_set_sflow_probability,
+ dpif_linux_queue_to_priority,
dpif_linux_recv,
dpif_linux_recv_wait,
};
dpif_linux_recv,
dpif_linux_recv_wait,
};
@@
-718,11
+730,7
@@
get_major(const char *target)
return major;
}
} else {
return major;
}
} else {
- static bool warned;
- if (!warned) {
- VLOG_WARN("%s:%d: syntax error", fn, ln);
- }
- warned = true;
+ VLOG_WARN_ONCE("%s:%d: syntax error", fn, ln);
}
}
}
}