[DRBD-cvs] svn commit by phil - r2783 - in trunk: drbd drbd/linux scripts - Missing files of last commit.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-03-05 11:44:22 +0100 (Mon, 05 Mar 2007)
New Revision: 2783

Modified:
   trunk/drbd/connector.c
   trunk/drbd/linux/drbd_config.h
   trunk/scripts/adjust_drbd_config_h.sh
Log:
Missing files of last commit.


Modified: trunk/drbd/connector.c
===================================================================
--- trunk/drbd/connector.c	2007-03-05 10:21:36 UTC (rev 2782)
+++ trunk/drbd/connector.c	2007-03-05 10:44:22 UTC (rev 2783)
@@ -36,7 +36,7 @@
 
 #include <net/sock.h>
 
-#ifdef NETLINK_ROUTE6
+#ifdef DRBD_NL_DST_GROUPS
    /* pre 2.6.16 */
 #  define NETLINK_GROUP(skb) NETLINK_CB(skb).dst_groups
 #else 

Modified: trunk/drbd/linux/drbd_config.h
===================================================================
--- trunk/drbd/linux/drbd_config.h	2007-03-05 10:21:36 UTC (rev 2782)
+++ trunk/drbd/linux/drbd_config.h	2007-03-05 10:44:22 UTC (rev 2783)
@@ -69,4 +69,8 @@
 // some older distribution kernels don't.
 //#define DEFINE_SOCK_CREATE_KERN
 
+// in older kernels (vanilla < 2.6.16) struct netlink_skb_parms has a
+// member called dst_groups. Later it is called dst_group (without 's').
+//#define DRBD_NL_DST_GROUPS
+
 #endif

Modified: trunk/scripts/adjust_drbd_config_h.sh
===================================================================
--- trunk/scripts/adjust_drbd_config_h.sh	2007-03-05 10:21:36 UTC (rev 2782)
+++ trunk/scripts/adjust_drbd_config_h.sh	2007-03-05 10:44:22 UTC (rev 2783)
@@ -105,7 +105,7 @@
  s{.*(#define DEFINE_SOCK_CREATE_KERN.*)}
   { ( $have_sock_create_kern ? '//' : '' ) . \$1}e;
  s{.*(#define DRBD_NL_DST_GROUPS.*)}
-  { ( $have_nl_dst_groups ? '//' : '' ) . \$1}e;
+  { ( $have_nl_dst_groups ? '' : '//' ) . \$1}e;
  " \
 	  < ./linux/drbd_config.h \
 	  > ./linux/drbd_config.h.new