sfc: support TC decap rules matching on enc_src_port

[linux.git] / net / lapb / lapb_timer.c

diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c
index 0230b272b7d1db9ef1864f4f6a57948593f61346..5be68869064de037f7e4b324cbe37ca291fcd2ab 100644 (file)
--- a/net/lapb/lapb_timer.c
+++ b/net/lapb/lapb_timer.c
@@ -40,7 +40,7 @@ void lapb_start_t1timer(struct lapb_cb *lapb)
        lapb->t1timer.function = lapb_t1timer_expiry;
        lapb->t1timer.expires  = jiffies + lapb->t1;
 
-       lapb->t1timer_stop = false;
+       lapb->t1timer_running = true;
        add_timer(&lapb->t1timer);
 }
 
@@ -51,25 +51,25 @@ void lapb_start_t2timer(struct lapb_cb *lapb)
        lapb->t2timer.function = lapb_t2timer_expiry;
        lapb->t2timer.expires  = jiffies + lapb->t2;
 
-       lapb->t2timer_stop = false;
+       lapb->t2timer_running = true;
        add_timer(&lapb->t2timer);
 }
 
 void lapb_stop_t1timer(struct lapb_cb *lapb)
 {
-       lapb->t1timer_stop = true;
+       lapb->t1timer_running = false;
        del_timer(&lapb->t1timer);
 }
 
 void lapb_stop_t2timer(struct lapb_cb *lapb)
 {
-       lapb->t2timer_stop = true;
+       lapb->t2timer_running = false;
        del_timer(&lapb->t2timer);
 }
 
 int lapb_t1timer_running(struct lapb_cb *lapb)
 {
-       return timer_pending(&lapb->t1timer);
+       return lapb->t1timer_running;
 }
 
 static void lapb_t2timer_expiry(struct timer_list *t)
@@ -79,13 +79,14 @@ static void lapb_t2timer_expiry(struct timer_list *t)
        spin_lock_bh(&lapb->lock);
        if (timer_pending(&lapb->t2timer)) /* A new timer has been set up */
                goto out;
-       if (lapb->t2timer_stop) /* The timer has been stopped */
+       if (!lapb->t2timer_running) /* The timer has been stopped */
                goto out;
 
        if (lapb->condition & LAPB_ACK_PENDING_CONDITION) {
                lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
                lapb_timeout_response(lapb);
        }
+       lapb->t2timer_running = false;
 
 out:
        spin_unlock_bh(&lapb->lock);
@@ -98,7 +99,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)
        spin_lock_bh(&lapb->lock);
        if (timer_pending(&lapb->t1timer)) /* A new timer has been set up */
                goto out;
-       if (lapb->t1timer_stop) /* The timer has been stopped */
+       if (!lapb->t1timer_running) /* The timer has been stopped */
                goto out;
 
        switch (lapb->state) {
@@ -127,6 +128,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)
                                lapb->state = LAPB_STATE_0;
                                lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
                                lapb_dbg(0, "(%p) S1 -> S0\n", lapb->dev);
+                               lapb->t1timer_running = false;
                                goto out;
                        } else {
                                lapb->n2count++;
@@ -151,6 +153,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)
                                lapb->state = LAPB_STATE_0;
                                lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT);
                                lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
+                               lapb->t1timer_running = false;
                                goto out;
                        } else {
                                lapb->n2count++;
@@ -169,6 +172,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)
                                lapb_stop_t2timer(lapb);
                                lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
                                lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
+                               lapb->t1timer_running = false;
                                goto out;
                        } else {
                                lapb->n2count++;
@@ -186,6 +190,7 @@ static void lapb_t1timer_expiry(struct timer_list *t)
                                lapb->state = LAPB_STATE_0;
                                lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
                                lapb_dbg(0, "(%p) S4 -> S0\n", lapb->dev);
+                               lapb->t1timer_running = false;
                                goto out;
                        } else {
                                lapb->n2count++;