patch-2.4.23 linux-2.4.23/net/irda/wrapper.c
Next file: linux-2.4.23/net/netlink/af_netlink.c
Previous file: linux-2.4.23/net/irda/qos.c
Back to the patch index
Back to the overall index
- Lines: 83
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/net/irda/wrapper.c
- Orig date:
2001-04-30 16:26:09.000000000 -0700
diff -urN linux-2.4.22/net/irda/wrapper.c linux-2.4.23/net/irda/wrapper.c
@@ -93,16 +93,16 @@
* Nothing to worry about, but we set the default number of
* BOF's
*/
- IRDA_DEBUG(1, __FUNCTION__ "(), wrong magic in skb!\n");
+ IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __FUNCTION__);
xbofs = 10;
} else
xbofs = cb->xbofs + cb->xbofs_delay;
- IRDA_DEBUG(4, __FUNCTION__ "(), xbofs=%d\n", xbofs);
+ IRDA_DEBUG(4, "%s(), xbofs=%d\n", __FUNCTION__, xbofs);
/* Check that we never use more than 115 + 48 xbofs */
if (xbofs > 163) {
- IRDA_DEBUG(0, __FUNCTION__ "(), too many xbofs (%d)\n", xbofs);
+ IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __FUNCTION__, xbofs);
xbofs = 163;
}
@@ -265,7 +265,7 @@
case EOF:
/* Abort frame */
rx_buff->state = OUTSIDE_FRAME;
- IRDA_DEBUG(1, __FUNCTION__ "(), abort frame\n");
+ IRDA_DEBUG(1, "%s(), abort frame\n", __FUNCTION__);
stats->rx_errors++;
stats->rx_frame_errors++;
break;
@@ -289,13 +289,12 @@
{
switch (byte) {
case BOF: /* New frame? */
- IRDA_DEBUG(1, __FUNCTION__
- "(), Discarding incomplete frame\n");
+ IRDA_DEBUG(1, "%s(), Discarding incomplete frame\n", __FUNCTION__);
rx_buff->state = BEGIN_FRAME;
irda_device_set_media_busy(dev, TRUE);
break;
case CE:
- WARNING(__FUNCTION__ "(), state not defined\n");
+ WARNING("%s(), state not defined\n", __FUNCTION__);
break;
case EOF: /* Abort frame */
rx_buff->state = OUTSIDE_FRAME;
@@ -311,7 +310,7 @@
rx_buff->fcs = irda_fcs(rx_buff->fcs, byte);
rx_buff->state = INSIDE_FRAME;
} else {
- IRDA_DEBUG(1, __FUNCTION__ "(), rx buffer overflow\n");
+ IRDA_DEBUG(1, "%s(), rx buffer overflow\n", __FUNCTION__);
rx_buff->state = OUTSIDE_FRAME;
}
break;
@@ -332,8 +331,7 @@
switch (byte) {
case BOF: /* New frame? */
- IRDA_DEBUG(1, __FUNCTION__
- "(), Discarding incomplete frame\n");
+ IRDA_DEBUG(1, "%s(), Discarding incomplete frame\n", __FUNCTION__);
rx_buff->state = BEGIN_FRAME;
irda_device_set_media_busy(dev, TRUE);
break;
@@ -354,7 +352,7 @@
/* Wrong CRC, discard frame! */
irda_device_set_media_busy(dev, TRUE);
- IRDA_DEBUG(1, __FUNCTION__ "(), crc error\n");
+ IRDA_DEBUG(1, "%s(), crc error\n", __FUNCTION__);
stats->rx_errors++;
stats->rx_crc_errors++;
}
@@ -364,8 +362,7 @@
rx_buff->data[rx_buff->len++] = byte;
rx_buff->fcs = irda_fcs(rx_buff->fcs, byte);
} else {
- IRDA_DEBUG(1, __FUNCTION__
- "(), Rx buffer overflow, aborting\n");
+ IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n", __FUNCTION__);
rx_buff->state = OUTSIDE_FRAME;
}
break;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)