X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fcompat.h;h=71fa06c1b7b183019967f2c374bd97029937e0e8;hb=9b80f761bed9a32c1b0eb22ee3361966057ea973;hp=36d00258b4ab1a1bb04a148ed7896cf9d6d6918f;hpb=a647150f01cf09eddc6d28bfec88b1bb8bab30df;p=sliver-openvswitch.git

diff --git a/datapath/compat.h b/datapath/compat.h
index 36d00258b..71fa06c1b 100644
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -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
- * openvswitch_mod)").
+ * openvswitch)").
  *
  * 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
@@ -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)
 
+#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 */