diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-01-02 08:02:06 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-01-02 08:02:06 -0500 |
| commit | 37e2c2a775fc887acd1432908478dfd532f7f00f (patch) | |
| tree | e51ebc699d8e262fd47e0913be6a711cb1a7b565 /net/lapb/lapb_timer.c | |
| parent | 1c8ddae09f4c102b97c9086cc70347e89468a547 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge commit v3.13-rc1 into kbuild/misc
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) | |||
| 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 | ||