Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0e56d99a5b557c760394d6941d7d1fc8d279eff3

Authored by David Woodhouse
1 parent b89588531f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

pppoatm: fix missing wakeup in pppoatm_send() 

Now that we can return zero from pppoatm_send() for reasons *other* than
the queue being full, that means we can't depend on a subsequent call to
pppoatm_pop() waking the queue, and we might leave it stalled
indefinitely.

Use the ->release_cb() callback to wake the queue after the sock is
unlocked.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Krzysztof Mazur <krzysiek@podlesie.net>

Showing 1 changed file with 12 additions and 0 deletions Side-by-side Diff

... ... @@ -60,6 +60,7 @@
60 60 struct atm_vcc *atmvcc; /* VCC descriptor */
61 61 void (*old_push)(struct atm_vcc *, struct sk_buff *);
62 62 void (*old_pop)(struct atm_vcc *, struct sk_buff *);
  63 + void (*old_release_cb)(struct atm_vcc *);
63 64 struct module *old_owner;
64 65 /* keep old push/pop for detaching */
65 66 enum pppoatm_encaps encaps;
... ... @@ -108,6 +109,14 @@
108 109 ppp_output_wakeup((struct ppp_channel *) arg);
109 110 }
110 111  
  112 +static void pppoatm_release_cb(struct atm_vcc *atmvcc)
  113 +{
  114 + struct pppoatm_vcc *pvcc = atmvcc_to_pvcc(atmvcc);
  115 +
  116 + tasklet_schedule(&pvcc->wakeup_tasklet);
  117 + if (pvcc->old_release_cb)
  118 + pvcc->old_release_cb(atmvcc);
  119 +}
111 120 /*
112 121 * This gets called every time the ATM card has finished sending our
113 122 * skb. The ->old_pop will take care up normal atm flow control,
... ... @@ -152,6 +161,7 @@
152 161 pvcc = atmvcc_to_pvcc(atmvcc);
153 162 atmvcc->push = pvcc->old_push;
154 163 atmvcc->pop = pvcc->old_pop;
  164 + atmvcc->release_cb = pvcc->old_release_cb;
155 165 tasklet_kill(&pvcc->wakeup_tasklet);
156 166 ppp_unregister_channel(&pvcc->chan);
157 167 atmvcc->user_back = NULL;
... ... @@ -388,6 +398,7 @@
388 398 pvcc->old_push = atmvcc->push;
389 399 pvcc->old_pop = atmvcc->pop;
390 400 pvcc->old_owner = atmvcc->owner;
  401 + pvcc->old_release_cb = atmvcc->release_cb;
391 402 pvcc->encaps = (enum pppoatm_encaps) be.encaps;
392 403 pvcc->chan.private = pvcc;
393 404 pvcc->chan.ops = &pppoatm_ops;
... ... @@ -403,6 +414,7 @@
403 414 atmvcc->user_back = pvcc;
404 415 atmvcc->push = pppoatm_push;
405 416 atmvcc->pop = pppoatm_pop;
  417 + atmvcc->release_cb = pppoatm_release_cb;
406 418 __module_get(THIS_MODULE);
407 419 atmvcc->owner = THIS_MODULE;
408 420