[maemo-commits] [maemo-commits] r15471 - in projects/connectivity/bluez-utils-debian/trunk: . patches

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-04-22 15:35:10 +0300 (Tue, 22 Apr 2008)
New Revision: 15471

Modified:
   projects/connectivity/bluez-utils-debian/trunk/changelog
   projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch
Log:
Fix previous patch which broke connection tracking

Modified: projects/connectivity/bluez-utils-debian/trunk/changelog
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/changelog	2008-04-22 12:07:17 UTC (rev 15470)
+++ projects/connectivity/bluez-utils-debian/trunk/changelog	2008-04-22 12:35:10 UTC (rev 15471)
@@ -1,3 +1,9 @@
+bluez-utils (3.28-0osso4) hardy; urgency=low
+
+  * Fix disconnection tracking bug caused by the previous fix. Fixes: NB#84673
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Tue, 22 Apr 2008 15:24:11 +0300
+
 bluez-utils (3.28-0osso3) unstable; urgency=low
 
   * CreateBonding should fail if storing the link key fails. Fixes: NB#83023

Modified: projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch
===================================================================
--- projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch	2008-04-22 12:07:17 UTC (rev 15470)
+++ projects/connectivity/bluez-utils-debian/trunk/patches/008_mem_full.patch	2008-04-22 12:35:10 UTC (rev 15471)
@@ -39,7 +39,7 @@
  static inline int get_bdaddr(int dev, bdaddr_t *sba, uint16_t handle, bdaddr_t *dba)
  {
  	struct hci_conn_list_req *cl;
-@@ -270,17 +302,27 @@
+@@ -270,17 +309,34 @@
  	evt_link_key_notify *evt = ptr;
  	bdaddr_t *dba = &evt->bdaddr;
  	char sa[18], da[18];
@@ -62,9 +62,16 @@
 -	hcid_dbus_bonding_process_complete(sba, dba, 0);
 +		hcid_dbus_bonding_process_complete(sba, dba, HCI_MEMORY_FULL);
 +
-+		if (get_handle(dev, sba, dba, &handle) == 0)
-+			hci_disconnect(dev, htobs(handle),
-+					HCI_OE_LOW_RESOURCES, 500);
++		if (get_handle(dev, sba, dba, &handle) == 0) {
++			disconnect_cp cp;
++
++			memset(&cp, 0, sizeof(cp));
++			cp.handle = htobs(handle);
++			cp.reason = HCI_OE_LOW_RESOURCES;
++
++			hci_send_cmd(dev, OGF_LINK_CTL, OCF_DISCONNECT,
++					DISCONNECT_CP_SIZE, &cp);
++		}
 +	} else
 +		hcid_dbus_bonding_process_complete(sba, dba, 0);