* [2.6 patch] net/ipv{4,6}/esp{4,6}.c must #include <linux/scatterlist.h>
@ 2007-10-27 2:34 Adrian Bunk
2007-10-27 5:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2007-10-27 2:34 UTC (permalink / raw)
To: David S. Miller, Jens Axboe; +Cc: linux-kernel, netdev
This patch fixes the following compile errors in some configurations:
<-- snip -->
...
CC net/ipv4/esp4.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c: In function 'esp_output':
/home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c:113: error: implicit declaration of function 'sg_init_table'
make[3]: *** [net/ipv4/esp4.o] Error 1
...
/home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c: In function 'esp6_output':
/home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c:112: error: implicit declaration of function 'sg_init_table'
make[3]: *** [net/ipv6/esp6.o] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
net/ipv4/esp4.c | 2 +-
net/ipv6/esp6.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
ecf93220d6af83516dbe04dcd09474a0423ce2ef
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index ba98401..23b647c 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -3,7 +3,7 @@
#include <net/ip.h>
#include <net/xfrm.h>
#include <net/esp.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/crypto.h>
#include <linux/kernel.h>
#include <linux/pfkeyv2.h>
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index f67d51a..f8bb136 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -29,7 +29,7 @@
#include <net/ip.h>
#include <net/xfrm.h>
#include <net/esp.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/crypto.h>
#include <linux/kernel.h>
#include <linux/pfkeyv2.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [2.6 patch] net/ipv{4,6}/esp{4,6}.c must #include <linux/scatterlist.h>
2007-10-27 2:34 [2.6 patch] net/ipv{4,6}/esp{4,6}.c must #include <linux/scatterlist.h> Adrian Bunk
@ 2007-10-27 5:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-10-27 5:54 UTC (permalink / raw)
To: bunk; +Cc: jens.axboe, linux-kernel, netdev
From: Adrian Bunk <bunk@kernel.org>
Date: Sat, 27 Oct 2007 04:34:48 +0200
> This patch fixes the following compile errors in some configurations:
>
> <-- snip -->
>
> ...
> CC net/ipv4/esp4.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c: In function 'esp_output':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c:113: error: implicit declaration of function 'sg_init_table'
> make[3]: *** [net/ipv4/esp4.o] Error 1
> ...
> /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c: In function 'esp6_output':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c:112: error: implicit declaration of function 'sg_init_table'
> make[3]: *** [net/ipv6/esp6.o] Error 1
>
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
Applied, thanks Adrian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-27 5:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-27 2:34 [2.6 patch] net/ipv{4,6}/esp{4,6}.c must #include <linux/scatterlist.h> Adrian Bunk
2007-10-27 5:54 ` David 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).