diff --git a/[refs] b/[refs] index 33341d2cbc25..1f06fc36ef85 100644 --- 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 index 6f747582718e..969b7cdff59d 100644 --- 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;