can-calc-bit-timing: add some more timings for mscan and flexcan

[can-utils.git] / isotpdump.c

diff --git a/isotpdump.c b/isotpdump.c
index c5e911392a625b14bbc843f6e54d2081b7c6b39d..b2b650aa7996b48627a381d1702703f705c2f193 100644 (file)
--- a/isotpdump.c
+++ b/isotpdump.c
@@ -96,8 +96,6 @@ int main(int argc, char **argv)
        int timestamp = 0;
        int datidx = 0;
        unsigned long fflen = 0;
-       struct ifreq ifr;
-       int ifindex;
        struct timeval tv, last_tv;
        unsigned int n_pci;
        int opt;
@@ -202,12 +200,8 @@ int main(int argc, char **argv)
 
        setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, &rfilter, sizeof(rfilter));
 
-       strcpy(ifr.ifr_name, argv[optind]);
-       ioctl(s, SIOCGIFINDEX, &ifr);
-       ifindex = ifr.ifr_ifindex;
-
        addr.can_family = AF_CAN;
-       addr.can_ifindex = ifindex;
+       addr.can_ifindex = if_nametoindex(argv[optind]);
 
        if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
                perror("bind");
@@ -220,7 +214,7 @@ int main(int argc, char **argv)
                        perror("read");
                        return 1;
                } else if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
-                       fprintf(stderr, "read: incomplete CAN frame %lu %d\n", sizeof(frame), nbytes);
+                       fprintf(stderr, "read: incomplete CAN frame %zu %d\n", sizeof(frame), nbytes);
                        return 1;
                } else {