summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2013-11-25 12:49:13 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-11-25 12:49:13 +0100
commitc52321371fae37191f0c2e53ac4f8da504d2915d (patch)
tree7f5f77f4d8b1450270d38a2ab6b109849af129b0
parent0391cd2af67d9892f304b9bc10e884a48dec400c (diff)
downloadcanutils-c52321371fae37191f0c2e53ac4f8da504d2915d.tar.gz
canutils-c52321371fae37191f0c2e53ac4f8da504d2915d.tar.xz
canconfig: always print berr_counter
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--src/canconfig.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/canconfig.c b/src/canconfig.c
index 9cd4e01..75d82aa 100644
--- a/src/canconfig.c
+++ b/src/canconfig.c
@@ -487,25 +487,17 @@ static void cmd_restart_ms(int argc, char *argv[], const char *name)
static void do_show_berr_counter(const char *name)
{
struct can_berr_counter bc;
- struct can_ctrlmode cm;
- if (can_get_ctrlmode(name, &cm) < 0) {
- fprintf(stderr, "%s: failed to get controlmode\n", name);
+ memset(&bc, 0, sizeof(struct can_berr_counter));
+
+ if (can_get_berr_counter(name, &bc) < 0) {
+ fprintf(stderr, "%s: failed to get berr counters\n",
+ name);
exit(EXIT_FAILURE);
}
- if (cm.flags & CAN_CTRLMODE_BERR_REPORTING) {
- memset(&bc, 0, sizeof(struct can_berr_counter));
-
- if (can_get_berr_counter(name, &bc) < 0) {
- fprintf(stderr, "%s: failed to get berr counters\n",
- name);
- exit(EXIT_FAILURE);
- }
-
- fprintf(stdout, "%s txerr: %u rxerr: %u\n",
- name, bc.txerr, bc.rxerr);
- }
+ fprintf(stdout, "%s txerr: %u rxerr: %u\n",
+ name, bc.txerr, bc.rxerr);
}
static void cmd_berr_counter(int argc, char *argv[], const char *name)