bluetooth: disable reserved bits

 * sniffer says they are reserved
 * gfrm200 will not pair when these bits are sent
 * cherrypicked from 716fd54 in newkernel-3.19

 Cherry-picked from kernel/bruno commit: 08bf855

Change-Id: I78242b4019ebb35de16875536ccad1961b2dfcf7
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index d8326ae..0474bae 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -685,10 +685,12 @@
 		struct oob_data *oob_data;
 		u8 bdaddr_type;
 
+#ifndef CONFIG_BRUNO	/* GFRM200 rejects these bits */
 		if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED)) {
 			local_dist |= SMP_DIST_LINK_KEY;
 			remote_dist |= SMP_DIST_LINK_KEY;
 		}
+#endif
 
 		if (hcon->dst_type == ADDR_LE_DEV_PUBLIC)
 			bdaddr_type = BDADDR_LE_PUBLIC;