patch-2.1.12 linux/net/ax25/ax25_timer.c

Next file: linux/net/ipv4/ip_output.c
Previous file: linux/net/ax25/ax25_route.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.11/linux/net/ax25/ax25_timer.c linux/net/ax25/ax25_timer.c
@@ -150,12 +150,12 @@
 			if (ax25->sk != NULL) {
 				if (ax25->sk->debug)
 					printk(KERN_DEBUG "AX.25 T3 Timeout\n");
-				ax25->sk->state = TCP_CLOSE;
-				ax25->sk->err   = ETIMEDOUT;
+				ax25->sk->state     = TCP_CLOSE;
+				ax25->sk->err       = ETIMEDOUT;
 				ax25->sk->shutdown |= SEND_SHUTDOWN;
 				if (!ax25->sk->dead)
 					ax25->sk->state_change(ax25->sk);
-				ax25->sk->dead  = 1;
+				ax25->sk->dead      = 1;
 			}
 
 			ax25_reset_timer(ax25);
@@ -195,13 +195,13 @@
 		ax25->t1timer = ax25->t1 = ax25_calculate_t1(ax25);
 
 		if (ax25->sk != NULL) {
-			ax25->sk->state = TCP_CLOSE;
-			ax25->sk->err = 0;
+			ax25->sk->state     = TCP_CLOSE;
+			ax25->sk->err       = 0;
 			ax25->sk->shutdown |= SEND_SHUTDOWN;
 			if (!ax25->sk->dead)
 				ax25->sk->state_change(ax25->sk);
-			ax25->sk->dead = 1;
-			ax25->sk->destroy = 1;
+			ax25->sk->dead      = 1;
+			ax25->sk->destroy   = 1;
 		}
 	}
 		                                                                                                                                                                                                                                                                                                                                        
@@ -239,12 +239,12 @@
 					ax25_clear_queues(ax25);
 					ax25->state = AX25_STATE_0;
 					if (ax25->sk != NULL) {
-						ax25->sk->state = TCP_CLOSE;
-						ax25->sk->err   = ETIMEDOUT;
+						ax25->sk->state     = TCP_CLOSE;
+						ax25->sk->err       = ETIMEDOUT;
 						ax25->sk->shutdown |= SEND_SHUTDOWN;
 						if (!ax25->sk->dead)
 							ax25->sk->state_change(ax25->sk);
-						ax25->sk->dead  = 1;
+						ax25->sk->dead      = 1;
 					}
 				} else {
 					ax25->modulus = MODULUS;
@@ -270,12 +270,12 @@
 				ax25_send_control(ax25, DISC, POLLON, C_COMMAND);
 				
 				if (ax25->sk != NULL) {
-					ax25->sk->state = TCP_CLOSE;
-					ax25->sk->err   = ETIMEDOUT;
+					ax25->sk->state     = TCP_CLOSE;
+					ax25->sk->err       = ETIMEDOUT;
 					ax25->sk->shutdown |= SEND_SHUTDOWN;
 					if (!ax25->sk->dead)
 						ax25->sk->state_change(ax25->sk);
-					ax25->sk->dead  = 1;
+					ax25->sk->dead      = 1;
 				}
 			} else {
 				ax25->n2count++;
@@ -300,12 +300,12 @@
 				if (ax25->sk != NULL) {
 					if (ax25->sk->debug)
 						printk(KERN_DEBUG "AX.25 link Failure\n");
-					ax25->sk->state = TCP_CLOSE;
-					ax25->sk->err   = ETIMEDOUT;
+					ax25->sk->state     = TCP_CLOSE;
+					ax25->sk->err       = ETIMEDOUT;
 					ax25->sk->shutdown |= SEND_SHUTDOWN;
 					if (!ax25->sk->dead)
 						ax25->sk->state_change(ax25->sk);
-					ax25->sk->dead  = 1;
+					ax25->sk->dead      = 1;
 				}
 			} else {
 				ax25->n2count++;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov