* the remaining purpose of cmsg_nxthdr()
@ 2005-02-12 17:15 Olaf Hering
2005-02-14 17:47 ` [PATCH] fix typo in include/linux/socket.h Olaf Hering
0 siblings, 1 reply; 3+ messages in thread
From: Olaf Hering @ 2005-02-12 17:15 UTC (permalink / raw)
To: netdev
Are there still valid users of <linux/socket.h>?
All I found was uClibc-0.9.26/include/netinet/ip_tcp.h, which should
probably include their sys/socket.h instead.
diff -purN linux-2.6.11-rc3-bk8/include/linux/socket.h linux-2.6.11/include/linux/socket.h
--- linux-2.6.11-rc3-bk8/include/linux/socket.h 2005-02-03 02:56:33.000000000 +0100
+++ linux-2.6.11/include/linux/socket.h 2005-02-12 18:05:10.000000000 +0100
@@ -95,20 +95,8 @@ struct cmsghdr {
((mhdr)->msg_controllen - \
((char *)(cmsg) - (char *)(mhdr)->msg_control)))
-/*
- * This mess will go away with glibc
- */
-
#ifdef __KERNEL__
#define __KINLINE static inline
-#elif defined(__GNUC__)
-#define __KINLINE static __inline__
-#elif defined(__cplusplus)
-#define __KINLINE static inline
-#else
-#define __KINLINE static
-#endif
-
/*
* Get the next cmsg header
@@ -120,7 +108,7 @@ struct cmsghdr {
* Now it always returns valid, not truncated ancillary object
* HEADER. But caller still MUST check, that cmsg->cmsg_len is
* inside range, given by msg->msg_controllen before using
- * ansillary object DATA. --ANK (980731)
+ * ancillary object DATA. --ANK (980731)
*/
__KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size,
@@ -139,6 +127,7 @@ __KINLINE struct cmsghdr * cmsg_nxthdr (
{
return __cmsg_nxthdr(__msg->msg_control, __msg->msg_controllen, __cmsg);
}
+#endif
/* "Socket"-level control message types: */
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] fix typo in include/linux/socket.h
2005-02-12 17:15 the remaining purpose of cmsg_nxthdr() Olaf Hering
@ 2005-02-14 17:47 ` Olaf Hering
2005-02-15 18:23 ` David S. Miller
0 siblings, 1 reply; 3+ messages in thread
From: Olaf Hering @ 2005-02-14 17:47 UTC (permalink / raw)
To: netdev
I guess we have to reduce the patch to fix just the typo.
Signed-off-by: Olaf Hering <olh@suse.de>
diff -purN linux-2.6.11-rc3-bk8/include/linux/socket.h linux-2.6.11/include/linux/socket.h
--- linux-2.6.11-rc3-bk8/include/linux/socket.h 2005-02-03 02:56:33.000000000 +0100
+++ linux-2.6.11/include/linux/socket.h 2005-02-12 18:05:10.000000000 +0100
@@ -120,7 +108,7 @@ struct cmsghdr {
* Now it always returns valid, not truncated ancillary object
* HEADER. But caller still MUST check, that cmsg->cmsg_len is
* inside range, given by msg->msg_controllen before using
- * ansillary object DATA. --ANK (980731)
+ * ancillary object DATA. --ANK (980731)
*/
__KINLINE struct cmsghdr * __cmsg_nxthdr(void *__ctl, __kernel_size_t __size,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix typo in include/linux/socket.h
2005-02-14 17:47 ` [PATCH] fix typo in include/linux/socket.h Olaf Hering
@ 2005-02-15 18:23 ` David S. Miller
0 siblings, 0 replies; 3+ messages in thread
From: David S. Miller @ 2005-02-15 18:23 UTC (permalink / raw)
To: Olaf Hering; +Cc: netdev
On Mon, 14 Feb 2005 18:47:39 +0100
Olaf Hering <olh@suse.de> wrote:
> I guess we have to reduce the patch to fix just the typo.
>
> Signed-off-by: Olaf Hering <olh@suse.de>
Applied, thanks Olaf.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-02-15 18:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-12 17:15 the remaining purpose of cmsg_nxthdr() Olaf Hering
2005-02-14 17:47 ` [PATCH] fix typo in include/linux/socket.h Olaf Hering
2005-02-15 18:23 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).