linux-next: build failure after merge of the wireless tree

Stephen Rothwell
2011-06-23T03:03:24Z

Hi John,

After merging the wireless tree, today's linux-next build (x86_64
allmodconfig) failed like this:

net/bluetooth/smp.c: In function 'smp_e':
net/bluetooth/smp.c:49:21: error: storage size of 'sg' isn't known
net/bluetooth/smp.c:67:2: error: implicit declaration of function 'sg_init_one'
net/bluetooth/smp.c:49:21: warning: unused variable 'sg'

Caused by commit d22ef0bc83c5 ("Bluetooth: Add LE SMP Cryptoolbox
functions"). Missing include file, presumably. This batch has been in
the bluetooth tree since June 14, so it may have been exposed by the
removal of linux/mm.h from netdevice.h ...

I have added the following patch as a merge fix up for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Jun 2011 12:58:55 +1000
Subject: [PATCH] Bluetooth: include scatterlist.h where needed

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/bluetooth/smp.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 52e9ec2..a36f870 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -25,6 +25,7 @@
#include <net/bluetooth/l2cap.h>
#include <net/bluetooth/smp.h>
#include <linux/crypto.h>
+#include <linux/scatterlist.h>
#include <crypto/b128ops.h>

#define SMP_TIMEOUT 30000 /* 30 seconds */
--
1.7.5.4

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au