Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171583
b: refs/heads/master
c: fa6cae1
h: refs/heads/master
i:
  171581: 72f6357
  171579: 0914669
  171575: 3e1a230
  171567: 24821eb
  171551: 99baf54
  171519: bfc8620
v: v3
  • Loading branch information
zeal authored and David S. Miller committed Nov 17, 2009
1 parent 44f90cd commit a77d38c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3fd434d846a2c87f8f705b6876f81e4053f93749
refs/heads/master: fa6cae143d58c74d800b8dbdd8b9f058614874f2
22 changes: 7 additions & 15 deletions trunk/drivers/net/arm/ks8695net.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,24 +433,16 @@ ks8695_rx_irq(int irq, void *dev_id)
{
struct net_device *ndev = (struct net_device *)dev_id;
struct ks8695_priv *ksp = netdev_priv(ndev);
unsigned long status;

unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);

spin_lock(&ksp->rx_lock);

status = readl(KS8695_IRQ_VA + KS8695_INTST);

/*clean rx status bit*/
writel(status | mask_bit , KS8695_IRQ_VA + KS8695_INTST);

if (status & mask_bit) {
if (napi_schedule_prep(&ksp->napi)) {
/*disable rx interrupt*/
status &= ~mask_bit;
writel(status , KS8695_IRQ_VA + KS8695_INTEN);
__napi_schedule(&ksp->napi);
}
if (napi_schedule_prep(&ksp->napi)) {
unsigned long status = readl(KS8695_IRQ_VA + KS8695_INTEN);
unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);
/*disable rx interrupt*/
status &= ~mask_bit;
writel(status , KS8695_IRQ_VA + KS8695_INTEN);
__napi_schedule(&ksp->napi);
}

spin_unlock(&ksp->rx_lock);
Expand Down

0 comments on commit a77d38c

Please sign in to comment.