From 548fa573bf104d5342fa03f4cdb6f0828a043cdf Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sun, 27 Jan 2008 13:58:11 +0000 Subject: [PATCH] --- yaml --- r: 82681 b: refs/heads/master c: 6344f0521aac9f93c312826216762f2185268390 h: refs/heads/master i: 82679: bd02e7507e2931c9a5be155e2edc902f9f0cf95d v: v3 --- [refs] | 2 +- trunk/drivers/net/natsemi.c | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index c615b880ab80..707e25aa1f50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35b5f6b1a82b5c586e0b24c711dc6ba944e88ef1 +refs/heads/master: 6344f0521aac9f93c312826216762f2185268390 diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c index c329a4f5840c..0a3e60418e53 100644 --- a/trunk/drivers/net/natsemi.c +++ b/trunk/drivers/net/natsemi.c @@ -203,22 +203,8 @@ skbuff at an offset of "+2", 16-byte aligning the IP header. IIId. Synchronization Most operations are synchronized on the np->lock irq spinlock, except the -performance critical codepaths: - -The rx process only runs in the interrupt handler. Access from outside -the interrupt handler is only permitted after disable_irq(). - -The rx process usually runs under the netif_tx_lock. If np->intr_tx_reap -is set, then access is permitted under spin_lock_irq(&np->lock). - -Thus configuration functions that want to access everything must call - disable_irq(dev->irq); - netif_tx_lock_bh(dev); - spin_lock_irq(&np->lock); - -IV. Notes - -NatSemi PCI network controllers are very uncommon. +recieve and transmit paths which are synchronised using a combination of +hardware descriptor ownership, disabling interrupts and NAPI poll scheduling. IVb. References