diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 10:26:03 +1000 | 
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 10:26:03 +1000 | 
| commit | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (patch) | |
| tree | a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73 /net/bluetooth/hci_event.c | |
| parent | e8e5c2155b0035b6e04f29be67f6444bc914005b (diff) | |
| parent | 0c2daaafcdec726e89cbccca61d576de8429c537 (diff) | |
| download | olio-linux-3.10-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.tar.xz olio-linux-3.10-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.zip  | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 6c57fc71c7e..786b5de0bac 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1049,6 +1049,8 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s  	if (conn) {  		if (!ev->status)  			conn->link_mode |= HCI_LM_AUTH; +		else +			conn->sec_level = BT_SECURITY_LOW;  		clear_bit(HCI_CONN_AUTH_PEND, &conn->pend);  |