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

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

[PATCH] sky2: NAPI poll fix 



When sky2 driver gets lots of received packets at once, it can get stuck.
The NAPI poll routine gets called back to keep going, but since no IRQ bits
are set it doesn't make progress.

Increase version, since this is serious enough problem that I want to be
able to tell new from old problems.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 83b0fe81

drivers/net/sky2.c

+2 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include "sky2.h"



#define DRV_NAME		"sky2"

#define DRV_VERSION		"1.4"

#define DRV_VERSION		"1.5"

#define PFX			DRV_NAME " "



/*
@@ -2204,9 +2204,6 @@ static int sky2_poll(struct net_device *dev0, int *budget) 
	int work_done = 0;

	u32 status = sky2_read32(hw, B0_Y2_SP_EISR);



	if (!~status)

		goto out;



	if (status & Y2_IS_HW_ERR)

		sky2_hw_intr(hw);
@@ -2243,7 +2240,7 @@ static int sky2_poll(struct net_device *dev0, int *budget) 


	if (sky2_more_work(hw))

		return 1;

out:



	netif_rx_complete(dev0);



	sky2_read32(hw, B0_Y2_SP_LISR);