Skip to content

Commit

Permalink
e1000: FIX: Stop raw interrupts disabled nag from RT
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Mark Huth authored and Jeff Garzik committed Apr 26, 2007
1 parent 31d7644 commit f50393f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3378,12 +3378,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 */
Expand Down

0 comments on commit f50393f

Please sign in to comment.