diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 11:43:00 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-10-08 11:43:00 -0400 |
| commit | e3c55d406bd8df1a878546002c93db90c42be10c (patch) | |
| tree | efb0ba2707c95fd7166cf1b76887c43c977e37dd /net/lapb | |
| parent | 4d6e482675f13e33599fc3d18fc723959be0a9b6 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were
committed through other trees.
Diffstat (limited to 'net/lapb')
| -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) | |||
| 154 | } else { | 154 | } else { |
| 155 | lapb->n2count++; | 155 | lapb->n2count++; |
| 156 | lapb_requeue_frames(lapb); | 156 | lapb_requeue_frames(lapb); |
| 157 | lapb_kick(lapb); | ||
| 157 | } | 158 | } |
| 158 | break; | 159 | break; |
| 159 | 160 | ||