mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
[PATCH] sky2: receive error handling fix
If sky2 detects out of memory, or gets a bad frame, it reuses the same receive buffer, but forgets to poke the hardware. This could lead to the receiver getting stuck if there were lots of errors. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
758140900a
commit
5df791117a
1 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue