patch-2.2.0-pre9 linux/net/irda/irlap_frame.c

• Lines: 112
• Date: Wed Jan 20 11:05:33 1999
• Orig file: v2.2.0-pre8/linux/net/irda/irlap_frame.c
• Orig date: Tue Dec 22 14:16:59 1998

diff -u --recursive --new-file v2.2.0-pre8/linux/net/irda/irlap_frame.c linux/net/irda/irlap_frame.c
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Tue Aug 19 10:27:26 1997
- * Modified at:   Mon Dec 14 14:24:05 1998
+ * Modified at:   Tue Jan 19 22:58:13 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1998 Dag Brattli <dagb@cs.uit.no>, All Rights Resrved.
@@ -76,7 +76,7 @@
 }
 
 /*
- * Function irlap_send_connect_snrm_cmd (void)
+ * Function irlap_send_snrm_cmd (void)
  *
  *    Transmits a connect SNRM command frame
  */
@@ -564,7 +564,6 @@
 	if ( self->recycle_rr_skb) {
 		DEBUG( 4, __FUNCTION__ "(), recycling skb!\n");
 		skb = self->recycle_rr_skb;
-		skb->stamp.tv_sec = 0;
 		self->recycle_rr_skb = NULL;
 	}
 #endif      
@@ -640,7 +639,7 @@
 
 		/*  
 		 *  Set skb to NULL, so that the state machine will not 
-		 *  deallocate it.
+		 *  try to deallocate it.
 		 */
 		skb = NULL;  
 	}
@@ -652,11 +651,6 @@
 		irlap_do_event( self, RECV_RR_RSP, skb, info);
 }
 
-/*
- * Function irlap_send_rr_frame ()
- *
- *    Build and transmit RR (Receive Ready) frame
- */
 void irlap_send_frmr_frame( struct irlap_cb *self, int command)
 {
 	struct sk_buff *skb = NULL;
@@ -805,8 +799,6 @@
 	ASSERT( self->magic == LAP_MAGIC, return;);
 	ASSERT( skb != NULL, return;);
 
-	IS_SKB( skb, return;);
-
 	/* Initialize variables */
 	tx_skb = NULL;
 
@@ -888,8 +880,6 @@
 	ASSERT( self->magic == LAP_MAGIC, return;);
 	ASSERT( skb != NULL, return;);
 
-	IS_SKB( skb,return;);
-
 	/* Is this reliable or unreliable data? */
 	if ( skb->data[1] == I_FRAME) {
 
@@ -950,8 +940,6 @@
 	ASSERT( self->magic == LAP_MAGIC, return;);
 	ASSERT( skb != NULL, return;);
 
-	IS_SKB( skb, return;);
-
 	/* Is this reliable or unreliable data? */
 	if ( skb->data[1] == I_FRAME) {
 		
@@ -1066,8 +1054,7 @@
 
 	while ( skb_queue_len( &self->tx_list) > 0) {
 		
-		DEBUG( 0, "irlap_resend_rejected_frames: "
-		       "sending additional frames!\n");
+		DEBUG( 0, __FUNCTION__ "(), sending additional frames!\n");
 		if (( skb_queue_len( &self->tx_list) > 0) && 
 		    ( self->window > 0)) {
 			skb = skb_dequeue( &self->tx_list); 
@@ -1141,8 +1128,7 @@
 	
 	/* Insert next to receive (Vr) */
 	frame[1] |= (self->vr << 5);  /* insert nr */
-
-#if 0	
+#if 0
 	{
 		int vr, vs, pf;
 		
@@ -1151,7 +1137,7 @@
 		vs = (frame[1] >> 1) & 0x07;
 		pf = (frame[1] >> 4) & 0x01;
 		
-		DEBUG( 4, __FUNCTION__ "(), vs=%d, vr=%d, p=%d, %ld\n", 
+		DEBUG( 0, __FUNCTION__ "(), vs=%d, vr=%d, p=%d, %ld\n", 
 		       vs, vr, pf, jiffies);
 	}
 #endif	
@@ -1351,7 +1337,7 @@
 			self->stats.rx_packets++;
 			break;
 		case RNR:
-			DEBUG( 3, "*** RNR frame received! pf = %d ***\n", 
+			DEBUG( 4, "*** RNR frame received! pf = %d ***\n", 
 			       info.pf >> 4);
 			irlap_recv_rnr_frame( self, skb, &info);
 			self->stats.rx_packets++;