From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 1 Sep 2009 15:26:40 +0000 (+0200)
Subject: Add support for setting socketcan by ip tool
X-Git-Tag: fix-allnoconfig~355
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/ecef49aa3f32c2a5a69d1deb1b4427007c810cd4

Add support for setting socketcan by ip tool

This is necessary for 2.6.31 kernel
---

diff --git a/tests/_lib.sh b/tests/_lib.sh
index ccedc8c..3f9ef7c 100644
--- a/tests/_lib.sh
+++ b/tests/_lib.sh
@@ -51,16 +51,24 @@ prepare_lincan_virtual() {
     sleep 0.1
 }
 
+socketcan_set_bitrate() {
+    local canX=$1
+    if [ -f /sys/class/net/$canX/can_bittiming/bitrate ]; then
+	echo 1000000 > /sys/class/net/$canX/can_bittiming/bitrate
+    else
+	ip link set $canX type can bitrate 1000000
+    fi
+}
 prepare_socketcan_hw() {
     rmmod_can
     modprobe kvaser_pci
-    echo 1000000 > /sys/class/net/can0/can_bittiming/bitrate
+    socketcan_set_bitrate can0
     ip link set up dev can0
-    echo 1000000 > /sys/class/net/can1/can_bittiming/bitrate
-    ip link set up dev can1
-    echo 1000000 > /sys/class/net/can2/can_bittiming/bitrate
+    socketcan_set_bitrate can1
+    ip link set up dev can1 
+    socketcan_set_bitrate can2
     ip link set up dev can2
-    echo 1000000 > /sys/class/net/can3/can_bittiming/bitrate
+    socketcan_set_bitrate can3
     ip link set up dev can3
     CAN0=socketcan:can0
     CAN1=socketcan:can1