diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2009-11-25 11:34:33 +0100 |
|---|---|---|
| committer | Luotao Fu <l.fu@pengutronix.de> | 2009-11-25 16:18:29 +0100 |
| commit | 199ba6c48eaa6fd16d95ad356e36e4df4329601f (patch) | |
| tree | 9b406bc47f256ebd7edbf36119e8185531fe1ece | |
| parent | f088d2e5fa0c0e4ff2360b942ab443b32578a807 (diff) | |
| download | canutils-199ba6c48eaa6fd16d95ad356e36e4df4329601f.tar.gz canutils-199ba6c48eaa6fd16d95ad356e36e4df4329601f.tar.xz | |
[canconfig] switch to new API of libsocketcan-nl
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
| -rw-r--r-- | src/canconfig.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/canconfig.c b/src/canconfig.c index b5be62d..5e648a7 100644 --- a/src/canconfig.c +++ b/src/canconfig.c @@ -139,7 +139,7 @@ static void cmd_state(int argc, char *argv[]) static void do_restart(int argc, char *argv[]) { - if (scan_set_restart(argv[1]) < 0) { + if (scan_do_restart(argv[1]) < 0) { fprintf(stderr, "%s: failed to restart\n", argv[1]); exit(EXIT_FAILURE); } else { @@ -166,7 +166,7 @@ static inline void print_ctrlmode(__u32 cm_flags) static void do_show_ctrlmode(int argc, char *argv[]) { struct can_ctrlmode cm; - + if (scan_get_ctrlmode(argv[1], &cm) < 0) { fprintf(stderr, "%s: failed to get controlmode\n", argv[1]); exit(EXIT_FAILURE); @@ -196,6 +196,8 @@ static void do_set_ctrlmode(int argc, char* argv[]) struct can_ctrlmode cm; const char *name = argv[1]; + memset(&cm, 0, sizeof(cm)); + while (argc > 0) { if (!strcmp(*argv, "loopback")) { NEXT_ARG(); @@ -213,7 +215,7 @@ static void do_set_ctrlmode(int argc, char* argv[]) argc--, argv++; } - if (scan_set_ctrlmode(name, cm.mask, cm.flags) < 0) { + if (scan_set_ctrlmode(name, &cm) < 0) { fprintf(stderr, "%s: failed to set mode\n", argv[1]); exit(EXIT_FAILURE); } @@ -281,7 +283,6 @@ static void cmd_show_interface(int argc, char *argv[]) exit(EXIT_SUCCESS); } - int main(int argc, char *argv[]) { |