Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / linux / compat / genetlink-openvswitch.c

diff --git a/datapath/linux/compat/genetlink-openvswitch.c b/datapath/linux/compat/genetlink-openvswitch.c
index 3e687b7..359f916 100644 (file)
--- a/datapath/linux/compat/genetlink-openvswitch.c
+++ b/datapath/linux/compat/genetlink-openvswitch.c
@@ -1,4 +1,17 @@
-#define GENL_FIRST_MCGROUP 16
-#define GENL_LAST_MCGROUP  31
+#include <net/genetlink.h>
+#include <linux/version.h>
 
-#include "genetlink.inc"
+/* This is analogous to rtnl_notify() but uses genl_sock instead of rtnl.
+ *
+ * This is not (yet) in any upstream kernel. */
+void genl_notify(struct sk_buff *skb, struct net *net, u32 portid, u32 group,
+                struct nlmsghdr *nlh, gfp_t flags)
+{
+       struct sock *sk = net->genl_sock;
+       int report = 0;
+
+       if (nlh)
+               report = nlmsg_report(nlh);
+
+       nlmsg_notify(sk, skb, portid, group, report, flags);
+}