projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Don't track IP TOS value two different ways.
[openvswitch]
/
lib
/
dpif-linux.c
diff --git
a/lib/dpif-linux.c
b/lib/dpif-linux.c
index b7c9e3e6c14848e22b1d1995931bd91bf9ee09bd..52d73c6bb76d404dd32dd70bfbd6775a20e242bd 100644
(file)
--- a/
lib/dpif-linux.c
+++ b/
lib/dpif-linux.c
@@
-23,11
+23,14
@@
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
#include <fcntl.h>
#include <inttypes.h>
#include <net/if.h>
+#include <linux/types.h>
#include <linux/ethtool.h>
#include <linux/ethtool.h>
+#include <linux/pkt_sched.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
#include <stdlib.h>
#include <sys/ioctl.h>
+#include <sys/stat.h>
#include <unistd.h>
#include "dpif-provider.h"
#include <unistd.h>
#include "dpif-provider.h"
@@
-38,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 {
@@
-455,6
+458,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)
{
@@
-537,6
+552,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,
};