diff --git a/[refs] b/[refs] index 485fcde9f2ab..8d22c09fd854 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c554e10e84e958366344aa5bd293c6feea72d89 +refs/heads/master: f88c5b9887a95ce424db629ee79b57f6ef5bfddd diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c index ccdd196f5297..f9cdcbcb77d4 100644 --- a/trunk/drivers/net/smsc911x.c +++ b/trunk/drivers/net/smsc911x.c @@ -986,7 +986,7 @@ static int smsc911x_poll(struct napi_struct *napi, int budget) struct net_device *dev = pdata->dev; int npackets = 0; - while (likely(netif_running(dev)) && (npackets < budget)) { + while (npackets < budget) { unsigned int pktlength; unsigned int pktwords; struct sk_buff *skb;