Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup

1 files changed, 3 insertions, 0 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 77c4badb3e9d..98e4840935e2 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -767,6 +767,9 @@ static int hidp_setup_hid(struct hidp_session *session,
         snprintf(hid->phys, sizeof(hid->phys), "%pMR",
                  &l2cap_pi(session->ctrl_sock->sk)->chan->src);
 
+        /* NOTE: Some device modules depend on the dst address being stored in
+         * uniq. Please be aware of this before making changes to this behavior.
+         */
         snprintf(hid->uniq, sizeof(hid->uniq), "%pMR",
                  &l2cap_pi(session->ctrl_sock->sk)->chan->dst);