From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Jun 2011 02:58:55 +0000 (+1000)
Subject: Bluetooth: include scatterlist.h where needed
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f70490e6078abe1182437e629f67a7f0b6f08cd4;p=deliverable%2Flinux.git

Bluetooth: include scatterlist.h where needed

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 ...

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 52e9ec2644c1..a36f8707d964 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 */