From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Fri, 14 Oct 2011 22:56:21 +0000 (-0300)
Subject: Bluetooth: Fix mgmt interaction with userspace
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c636ef58865920c8ba9f877c1040bc73eb61e5cb;p=deliverable%2Flinux.git

Bluetooth: Fix mgmt interaction with userspace

Partially revert 34918cd7. struct mgmt_key_info needs to have the same
size as its version exported to userspace.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index d66da0f94f95..3062fd3a65d2 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -101,8 +101,6 @@ struct mgmt_key_info {
 	u8 type;
 	u8 val[16];
 	u8 pin_len;
-	u8 dlen;
-	u8 data[0];
 } __packed;
 
 #define MGMT_OP_LOAD_KEYS		0x000D