projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shash: New function shash_is_empty().
[openvswitch]
/
datapath
/
datapath.h
diff --git
a/datapath/datapath.h
b/datapath/datapath.h
index 102b27f31f1af633d65bddd0333356297fe59425..3706219e0ad5788e26f33e8b492c3a485e4d4e4c 100644
(file)
--- a/
datapath/datapath.h
+++ b/
datapath/datapath.h
@@
-1,3
+1,11
@@
+/*
+ * Copyright (c) 2009 Nicira Networks.
+ * Distributed under the terms of the GNU GPL version 2.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
+ */
+
/* Interface exported by openvswitch_mod. */
#ifndef DATAPATH_H
/* Interface exported by openvswitch_mod. */
#ifndef DATAPATH_H
@@
-10,6
+18,7
@@
#include <linux/netdevice.h>
#include <linux/workqueue.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/workqueue.h>
#include <linux/skbuff.h>
+#include <linux/version.h>
#include "flow.h"
#include "brc_sysfs.h"
#include "flow.h"
#include "brc_sysfs.h"
@@
-58,8
+67,12
@@
struct datapath {
struct mutex mutex;
int dp_idx;
struct mutex mutex;
int dp_idx;
-#ifdef SUPPORT_SYSFS
+#ifdef CONFIG_SYSFS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
struct kobject ifobj;
struct kobject ifobj;
+#else
+ struct kobject *ifobj;
+#endif
#endif
int drop_frags;
#endif
int drop_frags;
@@
-88,7
+101,7
@@
struct net_bridge_port {
u16 port_no;
struct datapath *dp;
struct net_device *dev;
u16 port_no;
struct datapath *dp;
struct net_device *dev;
-#ifdef
SUPPORT
_SYSFS
+#ifdef
CONFIG
_SYSFS
struct kobject kobj;
#endif
struct list_head node; /* Element in datapath.ports. */
struct kobject kobj;
#endif
struct list_head node; /* Element in datapath.ports. */