projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use select.POLL* constants
[openvswitch]
/
datapath
/
compat.h
diff --git
a/datapath/compat.h
b/datapath/compat.h
index 36d00258b4ab1a1bb04a148ed7896cf9d6d6918f..3113b961e7b4ba336a07e3bfa189df2f76f84f64 100644
(file)
--- a/
datapath/compat.h
+++ b/
datapath/compat.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2007-2012 Nicira
Networks
.
+ * Copyright (c) 2007-2012 Nicira
, Inc
.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
@@
-58,12
+58,12
@@
static inline void skb_clear_rxhash(struct sk_buff *skb)
* exporting br_should_route_hook. Because the bridge module also exports the
* same symbol, the module loader will refuse to load both modules at the same
* time (e.g. "bridge: exports duplicate symbol br_should_route_hook (owned by
* exporting br_should_route_hook. Because the bridge module also exports the
* same symbol, the module loader will refuse to load both modules at the same
* time (e.g. "bridge: exports duplicate symbol br_should_route_hook (owned by
- * openvswitch
_mod
)").
+ * openvswitch)").
*
* Before Linux 2.6.36, Open vSwitch cannot safely coexist with the Linux
*
* Before Linux 2.6.36, Open vSwitch cannot safely coexist with the Linux
- * bridge module, so openvswitch
_mod
uses this macro in those versions. In
- * Linux 2.6.36 and later, Open vSwitch can coexist with the bridge module,
but
- *
it makes no sense to load both bridge and brcompat_mod, so brcompat_mod
uses
+ * bridge module, so openvswitch uses this macro in those versions. In
+ * Linux 2.6.36 and later, Open vSwitch can coexist with the bridge module,
+ *
but it makes no sense to load both bridge and brcompat, so brcompat
uses
* this macro in those versions.
*
* The use of "typeof" here avoids the need to track changes in the type of
* this macro in those versions.
*
* The use of "typeof" here avoids the need to track changes in the type of
@@
-73,4
+73,12
@@
static inline void skb_clear_rxhash(struct sk_buff *skb)
typeof(br_should_route_hook) br_should_route_hook; \
EXPORT_SYMBOL(br_should_route_hook)
typeof(br_should_route_hook) br_should_route_hook; \
EXPORT_SYMBOL(br_should_route_hook)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+#define GENL_SOCK(net) (genl_sock)
+#define SET_NETNSOK
+#else
+#define GENL_SOCK(net) ((net)->genl_sock)
+#define SET_NETNSOK .netnsok = true,
+#endif
+
#endif /* compat.h */
#endif /* compat.h */