Cipe compile-fix with 2.6.10-bk7 (post 2.6.10)

hallo,

9 days ago a patch 
(http://linux.bkbits.net:8080/linux-2.5/diffs/include/linux/[email protected]) 
went into linux 2.6.10-bk (the snapshots after 2.6.10), which prevents 
cipe compilation.

the following interim patch fixes it until 2.6.11 is released, after that 
the used version number should be increased (because it is wrong for 
2.6.10!) - against current cvs version:

--- cipe-linux/cipe/cipe.h.orig	2005-01-05 02:59:47.000000000 +0100
+++ cipe-linux/cipe/cipe.h	2005-01-05 03:04:44.000000000 +0100
@@ -345,8 +345,13 @@
      int                 cntrkey;
  #ifdef LINUX_25
      struct inet_sock    *sock;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
+#define SOCK(c) ((struct sock*)((c)->sock))
+#define IOPT(c) ((c)->sock)
+#else
  #define SOCK(c) ((struct sock*)((c)->sock))
  #define IOPT(c) (&(c)->sock->inet)
+#endif
  #else
      struct sock         *sock;
  #define SOCK(c) ((c)->sock)


i.A.
Sven Koch
Server Management

-- 
com.unit GmbH                   http://www.comunit.net/
Eiffestr. 598                   20537 Hamburg | Germany
Fon +49-40-2111 05 25           Fax  +49-40-2111 05 26

--
Message sent by the [email protected] mailing list.
Unsubscribe: mail [email protected], "unsubscribe cipe-l" in body
Other commands available with "help" in body to the same address.
CIPE info and list archive: <URL:http://sites.inka.de/~bigred/devel/cipe.html>