Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5df79111 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 75814090

drivers/net/sky2.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

			}