]> rtime.felk.cvut.cz Git - socketcan-devel.git/commitdiff
Make use of strict_strtoul() in Kernels 2.6.25+
authorhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Wed, 11 Jun 2008 15:15:11 +0000 (15:15 +0000)
committerhartkopp <hartkopp@030b6a49-0b11-0410-94ab-b0dab22257f2>
Wed, 11 Jun 2008 15:15:11 +0000 (15:15 +0000)
Based in hint from Robert Schwebel:

[patch 42/44] slcan: convert to strict_strtoul
https://lists.berlios.de/pipermail/socketcan-core/2008-June/001437.html

git-svn-id: svn://svn.berlios.de//socketcan/trunk@772 030b6a49-0b11-0410-94ab-b0dab22257f2

kernel/2.6/drivers/net/can/slcan.c

index 75f3afc1d737097bbb8634bb743cd354af714bfb..69dbc9aece4b996997b87600a490e41b9e69387a 100644 (file)
@@ -235,7 +235,13 @@ static void slc_bump(struct slcan *sl)
        cf.can_dlc = sl->rbuff[dlc_pos] & 0x0F; /* get can_dlc */
 
        sl->rbuff[dlc_pos] = 0; /* terminate can_id string */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
        cf.can_id = simple_strtoul(sl->rbuff+1, NULL, 16);
+#else
+       if (strict_strtoul(sl->rbuff+1, 16, (unsigned long *) &cf.can_id))
+               return;
+#endif
 
        if (!(cmd & 0x20)) /* NO tiny chars => extended frame format */
                cf.can_id |= CAN_EFF_FLAG;