diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-23 14:42:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 15:02:39 -0400 |
| commit | 117636092a87a28a013a4acb5de5492645ed620f (patch) | |
| tree | 6d91fa6bd7bf6d0e1671141d338028a17679e607 /net | |
| parent | 891039a9c2ddf73754ad84cdc9d030f1c6431858 (diff) | |
[PATCH] Fix breakage after SG cleanups
Commits
58b053e4ce9d2fc3023645c1b96e537c72aa8d9a ("Update arch/ to use sg helpers")
45711f1af6eff1a6d010703b4862e0d2b9afd056 ("[SG] Update drivers to use sg helpers")
fa05f1286be25a8ce915c5dd492aea61126b3f33 ("Update net/ to use sg helpers")
converted many files to use the scatter gather helpers without ensuring
that the necessary headerfile <linux/scatterlist> is included. This
happened to work for ia64, powerpc, sparc64 and x86 because they
happened to drag in that file via their <asm/dma-mapping.h>.
On most of the others this probably broke.
Instead of increasing the header file spider web I choose to include
<linux/scatterlist.h> directly into the affectes files.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_tkip.c | 1 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_wep.c | 1 | ||||
| -rw-r--r-- | net/mac80211/wep.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index c796661a021b..811777682e2b 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | #include <linux/random.h> | 16 | #include <linux/random.h> |
| 17 | #include <linux/scatterlist.h> | ||
| 17 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 18 | #include <linux/netdevice.h> | 19 | #include <linux/netdevice.h> |
| 19 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c index 0af6103d715c..9693429489ed 100644 --- a/net/ieee80211/ieee80211_crypt_wep.c +++ b/net/ieee80211/ieee80211_crypt_wep.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | #include <linux/random.h> | 16 | #include <linux/random.h> |
| 17 | #include <linux/scatterlist.h> | ||
| 17 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 18 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 19 | #include <asm/string.h> | 20 | #include <asm/string.h> |
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index cc806d640f7a..a84a23310ff4 100644 --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/crypto.h> | 16 | #include <linux/crypto.h> |
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <asm/scatterlist.h> | 19 | #include <linux/scatterlist.h> |
| 20 | 20 | ||
| 21 | #include <net/mac80211.h> | 21 | #include <net/mac80211.h> |
| 22 | #include "ieee80211_i.h" | 22 | #include "ieee80211_i.h" |