---

yaml --- r: 336072 b: refs/heads/master c: 81b4011 h: refs/heads/master v: v3
git-mirror · Nov 26, 2012 · 33ac3ba · 33ac3ba
1 parent c531e1a
commit 33ac3ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9faaa09e2a1335678f09c70a0d0eda095564bab
+refs/heads/master: 81b401100c01d2357031e874689f89bd788d13cd
diff --git a/trunk/net/can/bcm.c b/trunk/net/can/bcm.c
@@ -1084,6 +1084,9 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
 		op->sk = sk;
 		op->ifindex = ifindex;
 
+		/* ifindex for timeout events w/o previous frame reception */
+		op->rx_ifindex = ifindex;
+
 		/* initialize uninitialized (kzalloc) structure */
 		hrtimer_init(&op->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 		op->timer.function = bcm_rx_timeout_handler;