patch-2.1.16 linux/net/netrom/af_netrom.c

• Lines: 115
• Date: Sat Dec 14 13:40:12 1996
• Orig file: v2.1.15/linux/net/netrom/af_netrom.c
• Orig date: Thu Dec 12 19:37:31 1996

diff -u --recursive --new-file v2.1.15/linux/net/netrom/af_netrom.c linux/net/netrom/af_netrom.c
@@ -580,7 +580,6 @@
 	sk->priority      = SOPRI_NORMAL;
 	sk->mtu           = NETROM_MTU;	/* 236 */
 	sk->zapped        = 1;
-	sk->window	  = sysctl_netrom_transport_requested_window_size;
 
 	sk->state_change = def_callback1;
 	sk->data_ready   = def_callback2;
@@ -588,8 +587,8 @@
 	sk->error_report = def_callback1;
 
 	if (sock != NULL) {
-		sock->sk = sk;
-		sk->sleep  = &sock->wait;
+		sock->sk  = sk;
+		sk->sleep = &sock->wait;
 	}
 
 	skb_queue_head_init(&nr->ack_queue);
@@ -605,6 +604,7 @@
 	nr->t4       = sysctl_netrom_transport_busy_delay;
 	nr->idle     = sysctl_netrom_transport_no_activity_timeout;
 	nr->paclen   = sysctl_netrom_transport_packet_length;
+	nr->window   = sysctl_netrom_transport_requested_window_size;
 
 	nr->t1timer   = 0;
 	nr->t2timer   = 0;
@@ -669,7 +669,6 @@
 	sk->sndbuf      = osk->sndbuf;
 	sk->debug       = osk->debug;
 	sk->state       = TCP_ESTABLISHED;
-	sk->window      = osk->window;
 	sk->mtu         = osk->mtu;
 	sk->sleep       = osk->sleep;
 	sk->zapped      = osk->zapped;
@@ -690,6 +689,7 @@
 	nr->t4       = osk->protinfo.nr->t4;
 	nr->idle     = osk->protinfo.nr->idle;
 	nr->paclen   = osk->protinfo.nr->paclen;
+	nr->window   = osk->protinfo.nr->window;
 
 	nr->device   = osk->protinfo.nr->device;
 	nr->bpqext   = osk->protinfo.nr->bpqext;
@@ -774,8 +774,8 @@
 			break;
 	}
 
-	sock->sk = NULL;	
-	sk->socket = NULL;	/* Not used, but we should do this. **/
+	sock->sk   = NULL;	
+	sk->socket = NULL;	/* Not used, but we should do this */
 
 	return 0;
 }
@@ -1090,8 +1090,8 @@
 	circuit++;
 
 	/* Window negotiation */
-	if (window < make->window)
-		make->window = window;
+	if (window < make->protinfo.nr->window)
+		make->protinfo.nr->window = window;
 
 	/* L4 timeout negotiation */
 	if (skb->len == 37) {
@@ -1136,7 +1136,7 @@
 	unsigned char *asmptr;
 	int size;
 	
-	if (msg->msg_flags&~MSG_DONTWAIT)
+	if (msg->msg_flags & ~MSG_DONTWAIT)
 		return -EINVAL;
 
 	if (sk->zapped)
@@ -1174,7 +1174,7 @@
 
 	size = len + AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
 
-	if ((skb = sock_alloc_send_skb(sk, size, 0, msg->msg_flags&MSG_DONTWAIT, &err)) == NULL)
+	if ((skb = sock_alloc_send_skb(sk, size, 0, msg->msg_flags & MSG_DONTWAIT, &err)) == NULL)
 		return err;
 
 	skb->sk   = sk;
@@ -1248,7 +1248,7 @@
 		return -ENOTCONN;
 
 	/* Now we can treat all alike */
-	if ((skb = skb_recv_datagram(sk, flags, msg->msg_flags&MSG_DONTWAIT, &er)) == NULL)
+	if ((skb = skb_recv_datagram(sk, flags, msg->msg_flags & MSG_DONTWAIT, &er)) == NULL)
 		return er;
 
 	if (!sk->protinfo.nr->hdrincl) {
@@ -1272,12 +1272,12 @@
 		memcpy(&addr.sax25_call, skb->data + 7, AX25_ADDR_LEN);
 
 		*sax = addr;
-
 	}
 
 	msg->msg_namelen=sizeof(*sax);
 
 	skb_free_datagram(sk, skb);
+
 	return copied;
 }
 
@@ -1389,7 +1389,7 @@
 			s->protinfo.nr->t2      / PR_SLOWHZ,
 			s->protinfo.nr->n2count, s->protinfo.nr->n2,
 			s->protinfo.nr->rtt     / PR_SLOWHZ,
-			s->window, s->protinfo.nr->paclen,
+			s->protinfo.nr->window, s->protinfo.nr->paclen,
 			s->wmem_alloc, s->rmem_alloc);
 		
 		pos = begin + len;