datapath: Extend compatibility code for genl_register_mc_group().

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

diff --git a/datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c b/datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c
index 9e09215..3e687b7 100644 (file)
--- a/datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c
+++ b/datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c
@@ -1,22 +1,4 @@
-#include "net/genetlink.h"
+#define GENL_FIRST_MCGROUP 16
+#define GENL_LAST_MCGROUP  31
 
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-
-/* We use multicast groups 16 through 31 to avoid colliding with the multicast
- * group selected by brcompat_mod, which uses groups 32.  Collision isn't
- * fatal--multicast listeners should check that the family is the one that they
- * want and discard others--but it wastes time and memory to receive unwanted
- * messages. */
-int genl_register_mc_group(struct genl_family *family,
-                          struct genl_multicast_group *grp)
-{
-       /* This code is called single-threaded. */
-       static unsigned int next_id = 0;
-       grp->id = next_id++ % 16 + 16;
-       grp->family = family;
-
-       return 0;
-}
-
-#endif /* kernel < 2.6.23 */
+#include "genetlink.inc"