From 0816a9846e2d9a0d7a9dde61e19fcae4cac7f0d0 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 21 Feb 2012 08:14:26 +0100
Subject: [PATCH] --- yaml --- r: 290999 b: refs/heads/master c:
 c059e05353081471908c05029585765614e07cec h: refs/heads/master i:   290997:
 2a1b3c0de5b3b025b6e1c0f3ce2a8cd00e2dbdfa   290995:
 4dd78f8a4e8104969c23a5b8131f6c0cc4950c4b   290991:
 51bfb23084f96ba93bf9b957497bbb74627c5f59 v: v3

---
 [refs]                             | 2 +-
 trunk/include/net/bluetooth/mgmt.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23d89dad62cb..e71aa6de1b0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cacaf52f51697f832a26e8fdaa7b8e85785085da
+refs/heads/master: c059e05353081471908c05029585765614e07cec
diff --git a/trunk/include/net/bluetooth/mgmt.h b/trunk/include/net/bluetooth/mgmt.h
index 1dbadbe14785..ac59cdd0fa1b 100644
--- a/trunk/include/net/bluetooth/mgmt.h
+++ b/trunk/include/net/bluetooth/mgmt.h
@@ -135,6 +135,7 @@ struct mgmt_cp_set_dev_class {
 #define MGMT_OP_SET_LOCAL_NAME		0x000F
 struct mgmt_cp_set_local_name {
 	__u8 name[MGMT_MAX_NAME_LENGTH];
+	__u8 short_name[MGMT_MAX_SHORT_NAME_LENGTH];
 } __packed;
 
 #define MGMT_OP_ADD_UUID		0x0010