From deac40445986814f74abefd31eceea5bd4048985 Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Wed, 14 Mar 2012 18:54:15 +0200
Subject: [PATCH] --- yaml --- r: 306847 b: refs/heads/master c:
 2e3c35ead821498f5b0a5b6c62365fbb187420fc h: refs/heads/master i:   306845:
 0aacee47f4f8bd23ce4c11af5ef59fd893a08735   306843:
 74c32b82a99fbf9ecf940c904f1b1c99b84fabc0   306839:
 1607db702688907ea916de749fdbd3b433cec5b7   306831:
 8e18ccb4cabee08c2db1c41ed1dc323e2732deaa   306815:
 f460a165a44e487d35fe788bccf40cc89b58730d v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1d8c1d6e2269..025ff77c613f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f350c8724881fe6b1be9aa68d1e49508a6f8ab9
+refs/heads/master: 2e3c35ead821498f5b0a5b6c62365fbb187420fc
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 287623c35d61..0ef4b6ca6e44 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -288,7 +288,7 @@ static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
 	struct mgmt_rp_read_commands *rp;
 	const u16 num_commands = ARRAY_SIZE(mgmt_commands);
 	const u16 num_events = ARRAY_SIZE(mgmt_events);
-	u16 *opcode;
+	__le16 *opcode;
 	size_t rp_size;
 	int i, err;
 
@@ -2647,7 +2647,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
 	return 0;
 }
 
-struct mgmt_handler {
+static const struct mgmt_handler {
 	int (*func) (struct sock *sk, struct hci_dev *hdev, void *data,
 		     u16 data_len);
 	bool var_len;
@@ -2704,7 +2704,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
 	struct mgmt_hdr *hdr;
 	u16 opcode, index, len;
 	struct hci_dev *hdev = NULL;
-	struct mgmt_handler *handler;
+	const struct mgmt_handler *handler;
 	int err;
 
 	BT_DBG("got %zu bytes", msglen);