patch-1.3.15 linux/net/ipv4/tcp.c

Next file: linux/net/ipv4/udp.c
Previous file: linux/net/ipv4/raw.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.14/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -336,7 +336,7 @@
  *	of two things. Firstly we will bin packets even within the window
  *	in order to get the data we are waiting for into the memory limit.
  *	Secondly we bin common duplicate forms at receive time
- *      Better heuristics welcome
+ *	Better heuristics welcome
  */
    
 int tcp_select_window(struct sock *sk)
@@ -1456,7 +1456,7 @@
  *	and starts the transmit system.
  */
 
-static int tcp_write(struct sock *sk, unsigned char *from,
+static int tcp_write(struct sock *sk, const unsigned char *from,
 	  int len, int nonblock, unsigned flags)
 {
 	int copied = 0;
@@ -1576,11 +1576,11 @@
 
 		if ((skb = tcp_dequeue_partial(sk)) != NULL) 
 		{
-		        int hdrlen;
+			int hdrlen;
 
-		         /* IP header + TCP header */
+			 /* IP header + TCP header */
 			hdrlen = ((unsigned long)skb->h.th - (unsigned long)skb->data)
-			         + sizeof(struct tcphdr);
+				 + sizeof(struct tcphdr);
 	
 			/* Add more stuff to the end of skb->len */
 			if (!(flags & MSG_OOB)) 
@@ -1777,7 +1777,7 @@
  *	This is just a wrapper. 
  */
 
-static int tcp_sendto(struct sock *sk, unsigned char *from,
+static int tcp_sendto(struct sock *sk, const unsigned char *from,
 	   int len, int nonblock, unsigned flags,
 	   struct sockaddr_in *addr, int addr_len)
 {
@@ -2586,10 +2586,10 @@
 
 /*
  *	Look for tcp options. Parses everything but only knows about MSS.
- *      This routine is always called with the packet containing the SYN.
- *      However it may also be called with the ack to the SYN.  So you
- *      can't assume this is always the SYN.  It's always called after
- *      we have set up sk->mtu to our own MTU.
+ *	This routine is always called with the packet containing the SYN.
+ *	However it may also be called with the ack to the SYN.  So you
+ *	can't assume this is always the SYN.  It's always called after
+ *	we have set up sk->mtu to our own MTU.
  *
  *	We need at minimum to add PAWS support here. Possibly large windows
  *	as Linux gets deployed on 100Mb/sec networks.
@@ -3452,7 +3452,7 @@
 				sk->backoff = 0;
 			}
 			flag |= (2|4);	/* 2 is really more like 'don't adjust the rtt 
-			                   In this case as we just set it up */
+					   In this case as we just set it up */
 			cli();
 			oskb = sk->send_head;
 			IS_SKB(oskb);
@@ -3495,7 +3495,7 @@
 	if (skb_peek(&sk->write_queue) != NULL) 
 	{
 		if (after (sk->window_seq+1, sk->write_queue.next->h.seq) &&
-		        (sk->retransmits == 0 || 
+			(sk->retransmits == 0 || 
 			 sk->ip_xmit_timeout != TIME_WRITE ||
 			 before(sk->write_queue.next->h.seq, sk->rcv_ack_seq + 1))
 			&& sk->packets_out < sk->cong_window) 
@@ -3514,7 +3514,7 @@
  			/*
  			 *	Data to queue but no room.
  			 */
- 	        	reset_xmit_timer(sk, TIME_PROBE0, sk->rto);
+ 			reset_xmit_timer(sk, TIME_PROBE0, sk->rto);
  		}		
 	}
 	else

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this