diff --git a/[refs] b/[refs] index dbe642afa4c6..770dd02ae36a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e33f7a9f37d486f4c6cce5de18a6eea11d68f64f +refs/heads/master: 174c95d2526afbf974d9134f7f91fca8c4c8b538 diff --git a/trunk/drivers/net/can/slcan.c b/trunk/drivers/net/can/slcan.c index f523f1cc5142..4b70b7e8bdeb 100644 --- a/trunk/drivers/net/can/slcan.c +++ b/trunk/drivers/net/can/slcan.c @@ -197,7 +197,7 @@ static void slc_bump(struct slcan *sl) skb->ip_summed = CHECKSUM_UNNECESSARY; memcpy(skb_put(skb, sizeof(struct can_frame)), &cf, sizeof(struct can_frame)); - netif_rx(skb); + netif_rx_ni(skb); sl->dev->stats.rx_packets++; sl->dev->stats.rx_bytes += cf.can_dlc;