diff --git a/[refs] b/[refs] index e723a67a356e..64d43e69c05d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d5091e08c684912ed6b9ca03d1f7b01501b7bf6 +refs/heads/master: e3f240f460a36b158217944b52a85f304914c1a6 diff --git a/trunk/drivers/net/can/ti_hecc.c b/trunk/drivers/net/can/ti_hecc.c index df809e3f130e..5a2e1e3588a1 100644 --- a/trunk/drivers/net/can/ti_hecc.c +++ b/trunk/drivers/net/can/ti_hecc.c @@ -745,9 +745,10 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, } } - netif_receive_skb(skb); + netif_rx(skb); stats->rx_packets++; stats->rx_bytes += cf->can_dlc; + return 0; }