Merge branch 'linux-can:master' into master

chbinousamy · Oct 7, 2023 · 6a6ece7 · 6a6ece7
2 parents 7558890 + 46fae98
commit 6a6ece7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/calc-bit-timing/can-calc-bit-timing.c b/calc-bit-timing/can-calc-bit-timing.c
@@ -650,6 +650,7 @@ static const struct calc_bittiming_const can_calc_consts[] = {
 			.brp_inc = 1,
 		},
 		.ref_clk = {
+			{ .clk = 66000000, .name = "sama5d3", },
 			{ .clk = 99532800, .name = "ronetix PM9263", },
 			{ .clk = 100000000, },
 		},

diff --git a/canbusload.c b/canbusload.c
@@ -251,7 +251,6 @@ int main(int argc, char **argv)
 	struct canfd_frame frame;
 	int nbytes, i;
 	struct ifreq ifr;
-	sigset_t sigmask, savesigmask;
 
 	signal(SIGTERM, sigterm);
 	signal(SIGHUP, sigterm);
@@ -392,11 +391,8 @@ int main(int argc, char **argv)
 		for (i = 0; i < currmax; i++)
 			FD_SET(s[i], &rdfs);
 
-		savesigmask = sigmask;
-
-		if (pselect(s[currmax - 1] + 1, &rdfs, NULL, NULL, NULL, &sigmask) < 0) {
+		if (select(s[currmax - 1] + 1, &rdfs, NULL, NULL, NULL) < 0) {
 			//perror("pselect");
-			sigmask = savesigmask;
 			continue;
 		}