Revision: 415
http://vde.svn.sourceforge.net/vde/?rev=415&view=rev
Author: rd235
Date: 2010-06-01 11:17:44 +0000 (Tue, 01 Jun 2010)
Log Message:
-----------
Some parameters changed in net.h (2.6.32/2.6.33)
Modified Paths:
--------------
trunk/ipn/af_ipn.c
Modified: trunk/ipn/af_ipn.c
===================================================================
--- trunk/ipn/af_ipn.c 2010-05-29 15:47:54 UTC (rev 414)
+++ trunk/ipn/af_ipn.c 2010-06-01 11:17:44 UTC (rev 415)
@@ -44,6 +44,9 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
#define IPN_PRE2625
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+#define IPN_PRE2632
+#endif
/*extension of RCV_SHUTDOWN defined in include/net/sock.h
* when the bit is set recv fails */
@@ -90,8 +93,13 @@
struct msghdr *, size_t);
static int ipn_recvmsg(struct kiocb *, struct socket *,
struct msghdr *, size_t, int);
+#ifndef IPN_PRE2632
static int ipn_setsockopt(struct socket *sock, int level, int optname,
+ char __user *optval, unsigned int optlen);
+#else
+static int ipn_setsockopt(struct socket *sock, int level, int optname,
char __user *optval, int optlen);
+#endif
static int ipn_getsockopt(struct socket *sock, int level, int optname,
char __user *optval, int __user *optlen);
@@ -285,8 +293,11 @@
* when a node is "persistent", ipn_node survives while ipn_sock gets
released*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
static int ipn_create(struct socket *sock, int protocol)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+static int ipn_create(struct net *net,struct socket *sock, int protocol)
#else
-static int ipn_create(struct net *net,struct socket *sock, int protocol)
+static int ipn_create(struct net *net,struct socket *sock,
+ int protocol, int kern)
#endif
{
struct ipn_sock *ipn_sk;
@@ -1509,8 +1520,14 @@
}
/* IPN SETSOCKOPT */
+#ifndef IPN_PRE2632
static int ipn_setsockopt(struct socket *sock, int level, int optname,
- char __user *optval, int optlen) {
+ char __user *optval, unsigned int optlen)
+#else
+static int ipn_setsockopt(struct socket *sock, int level, int optname,
+ char __user *optval, int optlen)
+#endif
+{
struct ipn_node *ipn_node=((struct ipn_sock *)sock->sk)->node;
struct ipn_network *ipnn=ipn_node->ipn;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
vde-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vde-users
