diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 17:28:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 17:28:16 -0700 |
| commit | 97a7729a5c2f01faa076f38a7ec010961b456823 (patch) | |
| tree | d1aaecf81d1357b5920579347e6bb894b4bfe11c /net/lapb/lapb_timer.c | |
| parent | serial: mxs-auart: set the FIFO size to DMA buffer size (diff) | |
| parent | Linux 3.12-rc4 (diff) | |
| download | linux-dev-97a7729a5c2f01faa076f38a7ec010961b456823.tar.xz linux-dev-97a7729a5c2f01faa076f38a7ec010961b456823.zip | |
Merge 3.12-rc4 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/lapb/lapb_timer.c')
| -rw-r--r-- | net/lapb/lapb_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 54563ad8aeb1..355cc3b6fa4d 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -154,6 +154,7 @@ static void lapb_t1timer_expiry(unsigned long param) } else { lapb->n2count++; lapb_requeue_frames(lapb); + lapb_kick(lapb); } break; |