summaryrefslogtreecommitdiff
path: root/pfinet/linux-src/include/linux/socket.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-02-05 12:21:17 +0000
committerRoland McGrath <roland@gnu.org>2000-02-05 12:21:17 +0000
commit11282e4f068cacd7d08e61c5372b560f4656df87 (patch)
tree7330691c769e4cddf13fb86e58b80b61cd71ce2a /pfinet/linux-src/include/linux/socket.h
parenta60df9686250648ac13f559e98ebdc1422146494 (diff)
parente5f75e8ece5d1a8d3c17bd0156082caf153d3779 (diff)
Merge from vendor branch Linux:
Import of Linux 2.2.14 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/include/linux/socket.h')
-rw-r--r--pfinet/linux-src/include/linux/socket.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/pfinet/linux-src/include/linux/socket.h b/pfinet/linux-src/include/linux/socket.h
index d681aa5b..837a3e46 100644
--- a/pfinet/linux-src/include/linux/socket.h
+++ b/pfinet/linux-src/include/linux/socket.h
@@ -106,7 +106,7 @@ __KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size,
__ptr = (struct cmsghdr*)(((unsigned char *) __cmsg) + CMSG_ALIGN(__cmsg->cmsg_len));
if ((unsigned long)((char*)(__ptr+1) - (char *) __ctl) > __size)
- return NULL;
+ return (struct cmsghdr*)0;
return __ptr;
}