diff --git a/[refs] b/[refs] index 7147b8f3f66d..dcb67e7087c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64d0793109a98abcc2f4bf0c7d8b000fd220cdcd +refs/heads/master: f6ce5cca74b8681fdf1d7307edc66a7213b43f6f diff --git a/trunk/drivers/net/plip.c b/trunk/drivers/net/plip.c index 5071fcd8a0bd..baf2cbfc8863 100644 --- a/trunk/drivers/net/plip.c +++ b/trunk/drivers/net/plip.c @@ -663,7 +663,7 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl, case PLIP_PK_DONE: /* Inform the upper layer for the arrival of a packet. */ rcv->skb->protocol=plip_type_trans(rcv->skb, dev); - netif_rx(rcv->skb); + netif_rx_ni(rcv->skb); dev->last_rx = jiffies; dev->stats.rx_bytes += rcv->length.h; dev->stats.rx_packets++;