From 202cc20f90e3d2d9fe9020d93151f6261611121b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 1 Dec 2006 14:29:33 -0800 Subject: [PATCH] --- yaml --- r: 41548 b: refs/heads/master c: 5df791117afedf7fdc67dc0842dab4859e3edf69 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74438046e9f0..6624fa5046b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 758140900a82e3ed3bb2be1d4705dd352fe44825 +refs/heads/master: 5df791117afedf7fdc67dc0842dab4859e3edf69 diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 16616f5440d0..0c8a5354f99c 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -2065,7 +2065,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do) case OP_RXSTAT: skb = sky2_receive(dev, length, status); if (!skb) - break; + goto force_update; skb->protocol = eth_type_trans(skb, dev); dev->last_rx = jiffies; @@ -2081,8 +2081,8 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do) /* Update receiver after 16 frames */ if (++buf_write[le->link] == RX_BUF_WRITE) { - sky2_put_idx(hw, rxqaddr[le->link], - sky2->rx_put); +force_update: + sky2_put_idx(hw, rxqaddr[le->link], sky2->rx_put); buf_write[le->link] = 0; }