summaryrefslogtreecommitdiff
path: root/net/netrom/nr_timer.c
diff options
context:
space:
mode:
authorRalf Bächle <ralf@dea.linux-mips.net>2002-08-05 21:44:49 +0200
committerRalf Bächle <ralf@dea.linux-mips.net>2002-08-05 21:44:49 +0200
commitdf3856a026ac98d925bcfbb303b276e84dc7a78f (patch)
tree2cab9d3e23bf430b7abbae7df7d470b438adacb3 /net/netrom/nr_timer.c
parentf7c8ad709bc8cdf9461645f6d3aa54b67cd340ad (diff)
More reformatting of switch statements.
Diffstat (limited to 'net/netrom/nr_timer.c')
-rw-r--r--net/netrom/nr_timer.c102
1 files changed, 50 insertions, 52 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 35ee7a5b8982..6dd57436dc0d 100644
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -136,29 +136,28 @@ static void nr_heartbeat_expiry(unsigned long param)
nr_cb *nr = nr_sk(sk);
switch (nr->state) {
-
- case NR_STATE_0:
- /* Magic here: If we listen() and a new link dies before it
- is accepted() it isn't 'dead' so doesn't get removed. */
- if (sk->destroy || (sk->state == TCP_LISTEN && sk->dead)) {
- nr_destroy_socket(sk);
- return;
- }
- break;
-
- case NR_STATE_3:
- /*
- * Check for the state of the receive buffer.
- */
- if (atomic_read(&sk->rmem_alloc) < (sk->rcvbuf / 2) &&
- (nr->condition & NR_COND_OWN_RX_BUSY)) {
- nr->condition &= ~NR_COND_OWN_RX_BUSY;
- nr->condition &= ~NR_COND_ACK_PENDING;
- nr->vl = nr->vr;
- nr_write_internal(sk, NR_INFOACK);
- break;
- }
+ case NR_STATE_0:
+ /* Magic here: If we listen() and a new link dies before it
+ is accepted() it isn't 'dead' so doesn't get removed. */
+ if (sk->destroy || (sk->state == TCP_LISTEN && sk->dead)) {
+ nr_destroy_socket(sk);
+ return;
+ }
+ break;
+
+ case NR_STATE_3:
+ /*
+ * Check for the state of the receive buffer.
+ */
+ if (atomic_read(&sk->rmem_alloc) < (sk->rcvbuf / 2) &&
+ (nr->condition & NR_COND_OWN_RX_BUSY)) {
+ nr->condition &= ~NR_COND_OWN_RX_BUSY;
+ nr->condition &= ~NR_COND_ACK_PENDING;
+ nr->vl = nr->vr;
+ nr_write_internal(sk, NR_INFOACK);
break;
+ }
+ break;
}
nr_start_heartbeat(sk);
@@ -213,36 +212,35 @@ static void nr_t1timer_expiry(unsigned long param)
nr_cb *nr = nr_sk(sk);
switch (nr->state) {
-
- case NR_STATE_1:
- if (nr->n2count == nr->n2) {
- nr_disconnect(sk, ETIMEDOUT);
- return;
- } else {
- nr->n2count++;
- nr_write_internal(sk, NR_CONNREQ);
- }
- break;
-
- case NR_STATE_2:
- if (nr->n2count == nr->n2) {
- nr_disconnect(sk, ETIMEDOUT);
- return;
- } else {
- nr->n2count++;
- nr_write_internal(sk, NR_DISCREQ);
- }
- break;
-
- case NR_STATE_3:
- if (nr->n2count == nr->n2) {
- nr_disconnect(sk, ETIMEDOUT);
- return;
- } else {
- nr->n2count++;
- nr_requeue_frames(sk);
- }
- break;
+ case NR_STATE_1:
+ if (nr->n2count == nr->n2) {
+ nr_disconnect(sk, ETIMEDOUT);
+ return;
+ } else {
+ nr->n2count++;
+ nr_write_internal(sk, NR_CONNREQ);
+ }
+ break;
+
+ case NR_STATE_2:
+ if (nr->n2count == nr->n2) {
+ nr_disconnect(sk, ETIMEDOUT);
+ return;
+ } else {
+ nr->n2count++;
+ nr_write_internal(sk, NR_DISCREQ);
+ }
+ break;
+
+ case NR_STATE_3:
+ if (nr->n2count == nr->n2) {
+ nr_disconnect(sk, ETIMEDOUT);
+ return;
+ } else {
+ nr->n2count++;
+ nr_requeue_frames(sk);
+ }
+ break;
}
nr_start_t1timer(sk);