aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2012-05-08 16:20:33 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-05-23 16:55:49 -0400
commitd6e640f9766e2fb9aa3853b4ff19e4d7d5d7e373 (patch)
tree8042b08dfb17169907f71c65215bf4ec421f5ec5 /net
parent8b5e218d8caa7592d26e68157bd71f50426bb7ae (diff)
can: update documentation wording error frames -> error messages
As Heinz-Juergen Oertel pointed out 'CAN error frames' are a already defined term for the CAN protocol violation indication on the wire. To avoid confusion with the error messages created by CAN drivers available via CAN RAW sockets update the documentation and change the naming from 'error frames' to 'error messages' or 'error message frames'. Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net')
-rw-r--r--net/can/af_can.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 0ce2ad0696da..6efcd37b4bd0 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -334,8 +334,8 @@ static struct dev_rcv_lists *find_dev_rcv_lists(struct net_device *dev)
334 * relevant bits for the filter. 334 * relevant bits for the filter.
335 * 335 *
336 * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can 336 * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
337 * filter for error frames (CAN_ERR_FLAG bit set in mask). For error frames 337 * filter for error messages (CAN_ERR_FLAG bit set in mask). For error msg
338 * there is a special filterlist and a special rx path filter handling. 338 * frames there is a special filterlist and a special rx path filter handling.
339 * 339 *
340 * Return: 340 * Return:
341 * Pointer to optimal filterlist for the given can_id/mask pair. 341 * Pointer to optimal filterlist for the given can_id/mask pair.
@@ -347,7 +347,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
347{ 347{
348 canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */ 348 canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */
349 349
350 /* filter for error frames in extra filterlist */ 350 /* filter for error message frames in extra filterlist */
351 if (*mask & CAN_ERR_FLAG) { 351 if (*mask & CAN_ERR_FLAG) {
352 /* clear CAN_ERR_FLAG in filter entry */ 352 /* clear CAN_ERR_FLAG in filter entry */
353 *mask &= CAN_ERR_MASK; 353 *mask &= CAN_ERR_MASK;
@@ -408,7 +408,7 @@ static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,
408 * <received_can_id> & mask == can_id & mask 408 * <received_can_id> & mask == can_id & mask
409 * 409 *
410 * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can 410 * The filter can be inverted (CAN_INV_FILTER bit set in can_id) or it can
411 * filter for error frames (CAN_ERR_FLAG bit set in mask). 411 * filter for error message frames (CAN_ERR_FLAG bit set in mask).
412 * 412 *
413 * The provided pointer to the sk_buff is guaranteed to be valid as long as 413 * The provided pointer to the sk_buff is guaranteed to be valid as long as
414 * the callback function is running. The callback function must *not* free 414 * the callback function is running. The callback function must *not* free
@@ -578,7 +578,7 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)
578 return 0; 578 return 0;
579 579
580 if (can_id & CAN_ERR_FLAG) { 580 if (can_id & CAN_ERR_FLAG) {
581 /* check for error frame entries only */ 581 /* check for error message frame entries only */
582 hlist_for_each_entry_rcu(r, n, &d->rx[RX_ERR], list) { 582 hlist_for_each_entry_rcu(r, n, &d->rx[RX_ERR], list) {
583 if (can_id & r->mask) { 583 if (can_id & r->mask) {
584 deliver(skb, r); 584 deliver(skb, r);