diff options
| author | Paul Moore <pmoore@redhat.com> | 2013-11-08 13:56:38 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-11-08 13:56:38 -0500 |
| commit | 94851b18d4eb94f8bbf0d9176f7429bd8e371f62 (patch) | |
| tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /net/lapb/lapb_timer.c | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
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 54563ad8aeb..355cc3b6fa4 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; |