mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	COPYING
	datapath/datapath.h
	lib/automake.mk
	lib/dpif-provider.h
	lib/dpif.c
	lib/hmap.h
	lib/netdev-provider.h
	lib/netdev.c
	lib/stream-ssl.h
	ofproto/executer.c
	ofproto/ofproto.c
	ofproto/ofproto.h
	tests/automake.mk
	utilities/ovs-ofctl.c
	utilities/ovs-vsctl.in
	vswitchd/ovs-vswitchd.conf.5.in
	xenserver/etc_init.d_vswitch
	xenserver/etc_xensource_scripts_vif
	xenserver/opt_xensource_libexec_interface-reconfigure
This commit is contained in:
Justin Pettit
2010-02-05 15:58:27 -08:00
parent 93ff0290fd 5819a7cdcf
commit a4af00400a
57 changed files with 5993 additions and 1467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/dpif-linux.c
View File

@@ -196,6 +196,7 @@ dpif_linux_delete(struct dpif *dpif_)
static int
dpif_linux_get_stats(const struct dpif *dpif_, struct odp_stats *stats)
{
memset(stats, 0, sizeof *stats);
return do_ioctl(dpif_, ODP_DP_STATS, stats);
}
@@ -395,6 +396,19 @@ dpif_linux_recv_set_mask(struct dpif *dpif_, int listen_mask)
return do_ioctl(dpif_, ODP_SET_LISTEN_MASK, &listen_mask);
}
static int
dpif_linux_get_sflow_probability(const struct dpif *dpif_,
uint32_t *probability)
{
return do_ioctl(dpif_, ODP_GET_SFLOW_PROBABILITY, probability);
}
static int
dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability)
{
return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability);
}
static int
dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
{
@@ -474,6 +488,8 @@ const struct dpif_class dpif_linux_class = {
dpif_linux_execute,
dpif_linux_recv_get_mask,
dpif_linux_recv_set_mask,
dpif_linux_get_sflow_probability,
dpif_linux_set_sflow_probability,
dpif_linux_recv,
dpif_linux_recv_wait,
};
@@ -554,13 +570,14 @@ make_openvswitch_device(int minor, char **fnp)
struct stat s;
char fn[128];
*fnp = NULL;
major = get_openvswitch_major();
if (major < 0) {
return -major;
}
dev = makedev(major, minor);
*fnp = NULL;
sprintf(fn, "%s/dp%d", dirname, minor);
if (!stat(fn, &s)) {
if (!S_ISCHR(s.st_mode)) {