commit 903285cb2f4fef96f74de771e868b277453d6f21
author Prerepa Viswanadham <dham@google.com> Tue Oct 28 23:49:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 28 23:49:28 2014 +0000
tree 9b46af421f16d054da306a15863a3ebef703f3e0
parent f89382760380cc3a2dd5d56366344eed2c00e561
parent 472c2a7bb0ac070e596084f9422157f7872c6dca

am 472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota

* commit '472c2a7bb0ac070e596084f9422157f7872c6dca':
  Don't starve a BT ACL link with 0 xmit quota

stack/l2cap/l2c_ble.c

diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c
index a132775..75a2bfb 100644
--- a/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@ -836,7 +836,7 @@
     if (num_lowpri_links > low_quota)
     {
         l2cb.ble_round_robin_quota = low_quota;
-        qq = qq_remainder = 0;
+        qq = qq_remainder = 1;
     }
     /* If each low priority link can have at least one buffer */
     else if (num_lowpri_links > 0)
@@ -851,7 +851,7 @@
     {
         l2cb.ble_round_robin_quota = 0;
         l2cb.ble_round_robin_unacked = 0;
-        qq = qq_remainder = 0;
+        qq = qq_remainder = 1;
     }
     L2CAP_TRACE_EVENT ("l2c_ble_link_adjust_allocation  num_hipri: %u  num_lowpri: %u  low_quota: %u  round_robin_quota: %u  qq: %u",
                         num_hipri_links, num_lowpri_links, low_quota,

stack/l2cap/l2c_link.c

diff --git a/stack/l2cap/l2c_link.c b/stack/l2cap/l2c_link.c
index aa8f66c..5ee5faa 100644
--- a/stack/l2cap/l2c_link.c
+++ b/stack/l2cap/l2c_link.c
@@ -743,7 +743,7 @@
     if (num_lowpri_links > low_quota)
     {
         l2cb.round_robin_quota = low_quota;
-        qq = qq_remainder = 0;
+        qq = qq_remainder = 1;
     }
     /* If each low priority link can have at least one buffer */
     else if (num_lowpri_links > 0)
@@ -758,7 +758,7 @@
     {
         l2cb.round_robin_quota = 0;
         l2cb.round_robin_unacked = 0;
-        qq = qq_remainder = 0;
+        qq = qq_remainder = 1;
     }
 
     L2CAP_TRACE_EVENT ("l2c_link_adjust_allocation  num_hipri: %u  num_lowpri: %u  low_quota: %u  round_robin_quota: %u  qq: %u",