From: Mark Huth <mhuth@mvista.com>
To: netdev@vger.kernel.org
Cc: auke-jan.h.kok@intel.com
Subject: [PATCH] e1000 stop raw interrupts disabled nag from RT
Date: Wed, 28 Feb 2007 19:54:56 -0700 [thread overview]
Message-ID: <45E64080.4070004@mvista.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: netdev_e1000_stop_rt_interrupt_nagging.patch --]
[-- Type: text/x-patch, Size: 939 bytes --]
Current e1000_xmit_frame spews raw interrupt disabled nag messages when
used with RT kernel patches. This patch uses spin_trylock_irqsave,
which allows RT patches to properly manage the irq semantics.
Signed-off-by: Mark Huth <mhuth@mvista.com>
---
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 619c892..48f94ee 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3363,12 +3363,9 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
(adapter->hw.mac_type == e1000_82573))
e1000_transfer_dhcp_info(adapter, skb);
- local_irq_save(flags);
- if (!spin_trylock(&tx_ring->tx_lock)) {
+ if (!spin_trylock_irqsave(&tx_ring->tx_lock, flags))
/* Collision - tell upper layer to requeue */
- local_irq_restore(flags);
return NETDEV_TX_LOCKED;
- }
/* need: count + 2 desc gap to keep tail from touching
* head, otherwise try next time */
next reply other threads:[~2007-03-01 2:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-01 2:54 Mark Huth [this message]
2007-03-01 3:18 ` [PATCH] e1000 stop raw interrupts disabled nag from RT Kok, Auke
2007-03-01 4:59 ` Mark Huth
2007-03-01 16:55 ` Kok, Auke
2007-03-01 17:11 ` Michal Schmidt
2007-03-01 17:29 ` Kok, Auke
2007-03-01 17:34 ` Michal Schmidt
2007-03-01 21:58 ` Mark Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45E64080.4070004@mvista.com \
--to=mhuth@mvista.com \
--cc=auke-jan.h.kok@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).