projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'iov_iter' into for-davem-2
[cascardo/linux.git]
/
net
/
irda
/
wrapper.c
diff --git
a/net/irda/wrapper.c
b/net/irda/wrapper.c
index
c246983
..
40a0f99
100644
(file)
--- a/
net/irda/wrapper.c
+++ b/
net/irda/wrapper.c
@@
-106,17
+106,17
@@
int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize)
* Nothing to worry about, but we set the default number of
* BOF's
*/
* Nothing to worry about, but we set the default number of
* BOF's
*/
-
IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __FUNCTION
__);
+
pr_debug("%s(), wrong magic in skb!\n", __func
__);
xbofs = 10;
} else
xbofs = cb->xbofs + cb->xbofs_delay;
xbofs = 10;
} else
xbofs = cb->xbofs + cb->xbofs_delay;
-
IRDA_DEBUG(4, "%s(), xbofs=%d\n", __FUNCTION
__, xbofs);
+
pr_debug("%s(), xbofs=%d\n", __func
__, xbofs);
/* Check that we never use more than 115 + 48 xbofs */
if (xbofs > 163) {
/* Check that we never use more than 115 + 48 xbofs */
if (xbofs > 163) {
-
IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __FUNCTION
__,
-
xbofs);
+
pr_debug("%s(), too many xbofs (%d)\n", __func
__,
+ xbofs);
xbofs = 163;
}
xbofs = 163;
}
@@
-134,8
+134,8
@@
int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize)
* transmitted after this point is 5.
*/
if(n >= (buffsize-5)) {
* transmitted after this point is 5.
*/
if(n >= (buffsize-5)) {
-
IRDA_ERROR
("%s(), tx buffer overflow (n=%d)\n",
-
__FUNCTION
__, n);
+
net_err_ratelimited
("%s(), tx buffer overflow (n=%d)\n",
+
__func
__, n);
return n;
}
return n;
}
@@
-286,8
+286,8
@@
async_unwrap_bof(struct net_device *dev,
case INSIDE_FRAME:
/* Not supposed to happen, the previous frame is not
* finished - Jean II */
case INSIDE_FRAME:
/* Not supposed to happen, the previous frame is not
* finished - Jean II */
-
IRDA_DEBUG(1,
"%s(), Discarding incomplete frame\n",
-
__FUNCTION
__);
+
pr_debug(
"%s(), Discarding incomplete frame\n",
+
__func
__);
stats->rx_errors++;
stats->rx_missed_errors++;
irda_device_set_media_busy(dev, TRUE);
stats->rx_errors++;
stats->rx_missed_errors++;
irda_device_set_media_busy(dev, TRUE);
@@
-360,7
+360,7
@@
async_unwrap_eof(struct net_device *dev,
/* Wrong CRC, discard frame! */
irda_device_set_media_busy(dev, TRUE);
/* Wrong CRC, discard frame! */
irda_device_set_media_busy(dev, TRUE);
-
IRDA_DEBUG(1, "%s(), crc error\n", __FUNCTION
__);
+
pr_debug("%s(), crc error\n", __func
__);
stats->rx_errors++;
stats->rx_crc_errors++;
}
stats->rx_errors++;
stats->rx_crc_errors++;
}
@@
-386,7
+386,7
@@
async_unwrap_ce(struct net_device *dev,
break;
case LINK_ESCAPE:
break;
case LINK_ESCAPE:
-
IRDA_WARNING("%s: state not defined\n", __FUNCTION
__);
+
net_warn_ratelimited("%s: state not defined\n", __func
__);
break;
case BEGIN_FRAME:
break;
case BEGIN_FRAME:
@@
-420,8
+420,8
@@
async_unwrap_other(struct net_device *dev,
rx_buff->fcs = irda_fcs(rx_buff->fcs, byte);
#endif
} else {
rx_buff->fcs = irda_fcs(rx_buff->fcs, byte);
#endif
} else {
-
IRDA_DEBUG(1,
"%s(), Rx buffer overflow, aborting\n",
-
__FUNCTION
__);
+
pr_debug(
"%s(), Rx buffer overflow, aborting\n",
+
__func
__);
rx_buff->state = OUTSIDE_FRAME;
}
break;
rx_buff->state = OUTSIDE_FRAME;
}
break;
@@
-439,8
+439,8
@@
async_unwrap_other(struct net_device *dev,
#endif
rx_buff->state = INSIDE_FRAME;
} else {
#endif
rx_buff->state = INSIDE_FRAME;
} else {
-
IRDA_DEBUG(1,
"%s(), Rx buffer overflow, aborting\n",
-
__FUNCTION
__);
+
pr_debug(
"%s(), Rx buffer overflow, aborting\n",
+
__func
__);
rx_buff->state = OUTSIDE_FRAME;
}
break;
rx_buff->state = OUTSIDE_FRAME;
}
break;