diff options
-rw-r--r-- | drivers/net/can/cc770/cc770.c | 2 | ||||
-rw-r--r-- | net/can/af_can.c | 2 | ||||
-rw-r--r-- | net/can/bcm.c | 12 | ||||
-rw-r--r-- | net/can/gw.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c index d8379278d648..c486fe510f37 100644 --- a/drivers/net/can/cc770/cc770.c +++ b/drivers/net/can/cc770/cc770.c | |||
@@ -60,7 +60,7 @@ MODULE_DESCRIPTION(KBUILD_MODNAME "CAN netdevice driver"); | |||
60 | * | 60 | * |
61 | * The message objects 1..14 can be used for TX and RX while the message | 61 | * The message objects 1..14 can be used for TX and RX while the message |
62 | * objects 15 is optimized for RX. It has a shadow register for reliable | 62 | * objects 15 is optimized for RX. It has a shadow register for reliable |
63 | * data receiption under heavy bus load. Therefore it makes sense to use | 63 | * data reception under heavy bus load. Therefore it makes sense to use |
64 | * this message object for the needed use case. The frame type (EFF/SFF) | 64 | * this message object for the needed use case. The frame type (EFF/SFF) |
65 | * for the message object 15 can be defined via kernel module parameter | 65 | * for the message object 15 can be defined via kernel module parameter |
66 | * "msgobj15_eff". If not equal 0, it will receive 29-bit EFF frames, | 66 | * "msgobj15_eff". If not equal 0, it will receive 29-bit EFF frames, |
diff --git a/net/can/af_can.c b/net/can/af_can.c index ac05be131df7..66e08040ced7 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
@@ -521,7 +521,7 @@ static void can_rx_delete_receiver(struct rcu_head *rp) | |||
521 | 521 | ||
522 | /** | 522 | /** |
523 | * can_rx_unregister - unsubscribe CAN frames from a specific interface | 523 | * can_rx_unregister - unsubscribe CAN frames from a specific interface |
524 | * @dev: pointer to netdevice (NULL => unsubcribe from 'all' CAN devices list) | 524 | * @dev: pointer to netdevice (NULL => unsubscribe from 'all' CAN devices list) |
525 | * @can_id: CAN identifier | 525 | * @can_id: CAN identifier |
526 | * @mask: CAN mask | 526 | * @mask: CAN mask |
527 | * @func: callback function on filter match | 527 | * @func: callback function on filter match |
diff --git a/net/can/bcm.c b/net/can/bcm.c index 6169aa2e42bc..ee9ffd956552 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -439,7 +439,7 @@ static void bcm_rx_update_and_send(struct bcm_op *op, | |||
439 | /* mark as used and throttled by default */ | 439 | /* mark as used and throttled by default */ |
440 | lastdata->can_dlc |= (RX_RECV|RX_THR); | 440 | lastdata->can_dlc |= (RX_RECV|RX_THR); |
441 | 441 | ||
442 | /* throtteling mode inactive ? */ | 442 | /* throttling mode inactive ? */ |
443 | if (!op->kt_ival2.tv64) { | 443 | if (!op->kt_ival2.tv64) { |
444 | /* send RX_CHANGED to the user immediately */ | 444 | /* send RX_CHANGED to the user immediately */ |
445 | bcm_rx_changed(op, lastdata); | 445 | bcm_rx_changed(op, lastdata); |
@@ -450,7 +450,7 @@ static void bcm_rx_update_and_send(struct bcm_op *op, | |||
450 | if (hrtimer_active(&op->thrtimer)) | 450 | if (hrtimer_active(&op->thrtimer)) |
451 | return; | 451 | return; |
452 | 452 | ||
453 | /* first receiption with enabled throttling mode */ | 453 | /* first reception with enabled throttling mode */ |
454 | if (!op->kt_lastmsg.tv64) | 454 | if (!op->kt_lastmsg.tv64) |
455 | goto rx_changed_settime; | 455 | goto rx_changed_settime; |
456 | 456 | ||
@@ -478,7 +478,7 @@ static void bcm_rx_cmp_to_index(struct bcm_op *op, unsigned int index, | |||
478 | const struct can_frame *rxdata) | 478 | const struct can_frame *rxdata) |
479 | { | 479 | { |
480 | /* | 480 | /* |
481 | * no one uses the MSBs of can_dlc for comparation, | 481 | * no one uses the MSBs of can_dlc for comparison, |
482 | * so we use it here to detect the first time of reception | 482 | * so we use it here to detect the first time of reception |
483 | */ | 483 | */ |
484 | 484 | ||
@@ -508,7 +508,7 @@ static void bcm_rx_cmp_to_index(struct bcm_op *op, unsigned int index, | |||
508 | } | 508 | } |
509 | 509 | ||
510 | /* | 510 | /* |
511 | * bcm_rx_starttimer - enable timeout monitoring for CAN frame receiption | 511 | * bcm_rx_starttimer - enable timeout monitoring for CAN frame reception |
512 | */ | 512 | */ |
513 | static void bcm_rx_starttimer(struct bcm_op *op) | 513 | static void bcm_rx_starttimer(struct bcm_op *op) |
514 | { | 514 | { |
@@ -537,7 +537,7 @@ static void bcm_rx_timeout_tsklet(unsigned long data) | |||
537 | } | 537 | } |
538 | 538 | ||
539 | /* | 539 | /* |
540 | * bcm_rx_timeout_handler - when the (cyclic) CAN frame receiption timed out | 540 | * bcm_rx_timeout_handler - when the (cyclic) CAN frame reception timed out |
541 | */ | 541 | */ |
542 | static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer) | 542 | static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer) |
543 | { | 543 | { |
@@ -625,7 +625,7 @@ static enum hrtimer_restart bcm_rx_thr_handler(struct hrtimer *hrtimer) | |||
625 | } | 625 | } |
626 | 626 | ||
627 | /* | 627 | /* |
628 | * bcm_rx_handler - handle a CAN frame receiption | 628 | * bcm_rx_handler - handle a CAN frame reception |
629 | */ | 629 | */ |
630 | static void bcm_rx_handler(struct sk_buff *skb, void *data) | 630 | static void bcm_rx_handler(struct sk_buff *skb, void *data) |
631 | { | 631 | { |
diff --git a/net/can/gw.c b/net/can/gw.c index 050a2110d43f..295f62e62eb3 100644 --- a/net/can/gw.c +++ b/net/can/gw.c | |||
@@ -361,7 +361,7 @@ static void can_can_gw_rcv(struct sk_buff *skb, void *data) | |||
361 | * The Controller Area Network controllers only accept CAN frames with | 361 | * The Controller Area Network controllers only accept CAN frames with |
362 | * correct CRCs - which are not visible in the controller registers. | 362 | * correct CRCs - which are not visible in the controller registers. |
363 | * According to skbuff.h documentation the csum_start element for IP | 363 | * According to skbuff.h documentation the csum_start element for IP |
364 | * checksums is undefined/unsued when ip_summed == CHECKSUM_UNNECESSARY. | 364 | * checksums is undefined/unused when ip_summed == CHECKSUM_UNNECESSARY. |
365 | * Only CAN skbs can be processed here which already have this property. | 365 | * Only CAN skbs can be processed here which already have this property. |
366 | */ | 366 | */ |
367 | 367 | ||