git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Change signature of smp_conn_security()
[pandora-kernel.git]
/
net
/
bluetooth
/
l2cap_sock.c
diff --git
a/net/bluetooth/l2cap_sock.c
b/net/bluetooth/l2cap_sock.c
index
e829236
..
158887a
100644
(file)
--- a/
net/bluetooth/l2cap_sock.c
+++ b/
net/bluetooth/l2cap_sock.c
@@
-27,6
+27,7
@@
/* Bluetooth L2CAP sockets. */
#include <linux/security.h>
/* Bluetooth L2CAP sockets. */
#include <linux/security.h>
+#include <linux/export.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
@@
-292,6
+293,7
@@
static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *l
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %p, sk %p", sock, sk);
+ memset(la, 0, sizeof(struct sockaddr_l2));
addr->sa_family = AF_BLUETOOTH;
*len = sizeof(struct sockaddr_l2);
addr->sa_family = AF_BLUETOOTH;
*len = sizeof(struct sockaddr_l2);
@@
-614,7
+616,7
@@
static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
break;
}
break;
}
- if (smp_conn_security(conn, sec.level))
+ if (smp_conn_security(conn
->hcon
, sec.level))
break;
err = 0;
break;
err = 0;