* [PATCH] timestamping: fix example build
@ 2010-03-13 5:23 Randy Dunlap
2010-03-15 23:05 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2010-03-13 5:23 UTC (permalink / raw
To: Netdev; +Cc: David Miller, Patrick Ohly
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix Makefiles so that Documentation/networking/timestamping/timestamping.c
will build when using the CONFIG_BUILD_DOCSRC kconfig option.
(timestamping.c does not build currently with its simple Makefile.)
Also fix printf format warnings.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Patrick Ohly <patrick.ohly@intel.com>
---
Documentation/networking/Makefile | 2 +
Documentation/networking/timestamping/Makefile | 11 ++++++++--
Documentation/networking/timestamping/timestamping.c | 10 ++++-----
3 files changed, 16 insertions(+), 7 deletions(-)
--- lnx-2634-rc1.orig/Documentation/networking/Makefile
+++ lnx-2634-rc1/Documentation/networking/Makefile
@@ -6,3 +6,5 @@ hostprogs-y := ifenslave
# Tell kbuild to always build the programs
always := $(hostprogs-y)
+
+obj-m := timestamping/
--- lnx-2634-rc1.orig/Documentation/networking/timestamping/Makefile
+++ lnx-2634-rc1/Documentation/networking/timestamping/Makefile
@@ -1,6 +1,13 @@
-CPPFLAGS = -I../../../include
+# kbuild trick to avoid linker error. Can be omitted if a module is built.
+obj- := dummy.o
-timestamping: timestamping.c
+# List of programs to build
+hostprogs-y := timestamping
+
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
+HOSTCFLAGS_timestamping.o += -I$(objtree)/usr/include
clean:
rm -f timestamping
--- lnx-2634-rc1.orig/Documentation/networking/timestamping/timestamping.c
+++ lnx-2634-rc1/Documentation/networking/timestamping/timestamping.c
@@ -41,9 +41,9 @@
#include <arpa/inet.h>
#include <net/if.h>
-#include "asm/types.h"
-#include "linux/net_tstamp.h"
-#include "linux/errqueue.h"
+#include <asm/types.h>
+#include <linux/net_tstamp.h>
+#include <linux/errqueue.h>
#ifndef SO_TIMESTAMPING
# define SO_TIMESTAMPING 37
@@ -164,7 +164,7 @@ static void printpacket(struct msghdr *m
gettimeofday(&now, 0);
- printf("%ld.%06ld: received %s data, %d bytes from %s, %d bytes control messages\n",
+ printf("%ld.%06ld: received %s data, %d bytes from %s, %zu bytes control messages\n",
(long)now.tv_sec, (long)now.tv_usec,
(recvmsg_flags & MSG_ERRQUEUE) ? "error" : "regular",
res,
@@ -173,7 +173,7 @@ static void printpacket(struct msghdr *m
for (cmsg = CMSG_FIRSTHDR(msg);
cmsg;
cmsg = CMSG_NXTHDR(msg, cmsg)) {
- printf(" cmsg len %d: ", cmsg->cmsg_len);
+ printf(" cmsg len %zu: ", cmsg->cmsg_len);
switch (cmsg->cmsg_level) {
case SOL_SOCKET:
printf("SOL_SOCKET ");
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] timestamping: fix example build
2010-03-13 5:23 [PATCH] timestamping: fix example build Randy Dunlap
@ 2010-03-15 23:05 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-03-15 23:05 UTC (permalink / raw
To: randy.dunlap; +Cc: netdev, patrick.ohly
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 12 Mar 2010 21:23:27 -0800
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix Makefiles so that Documentation/networking/timestamping/timestamping.c
> will build when using the CONFIG_BUILD_DOCSRC kconfig option.
> (timestamping.c does not build currently with its simple Makefile.)
>
> Also fix printf format warnings.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Patrick Ohly <patrick.ohly@intel.com>
Applied, thanks Randy.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-15 23:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-13 5:23 [PATCH] timestamping: fix example build Randy Dunlap
2010-03-15 23:05 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.