diff --git a/[refs] b/[refs] index 397b62531853..be110365f546 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15d317587e17dcb96484e46b17b6e826a1f97661 +refs/heads/master: 4ae47c2ddc55e3c571bb55fca921cfe9b02a685f diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 45864461aab6..1f7fb541ec54 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -2040,10 +2040,12 @@ static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev, { u32 cur; - for (cur = start; end - cur > 0; cur++) { + for (cur = start; end - cur != 0; cur++) { struct sk_buff *skb; unsigned int i = cur % NUM_RX_DESC; + WARN_ON((s32)(end - cur) < 0); + if (tp->Rx_skbuff[i]) continue;