Merge pull request #23 from ajneu/master1

[can-utils.git] / candump.c

diff --git a/candump.c b/candump.c
index eab949509adb4ef8414ee32291825d131b9bce80..5daf6222ca7d2d8e6a6beb4a4b598acf0d231ecd 100644 (file)
--- a/candump.c
+++ b/candump.c
@@ -499,14 +499,16 @@ int main(int argc, char **argv)
                                setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_ERR_FILTER,
                                           &err_mask, sizeof(err_mask));
 
+                       if (join_filter && setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_JOIN_FILTERS,
+                                                     &join_filter, sizeof(join_filter)) < 0) {
+                               perror("setsockopt CAN_RAW_JOIN_FILTERS not supported by your Linux Kernel");
+                               return 1;
+                       }
+
                        if (numfilter)
                                setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_FILTER,
                                           rfilter, numfilter * sizeof(struct can_filter));
 
-                       if (join_filter)
-                               setsockopt(s[i], SOL_CAN_RAW, CAN_RAW_JOIN_FILTERS,
-                                          &join_filter, sizeof(join_filter));
-
                        free(rfilter);
 
                } /* if (nptr) */