diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-19 15:48:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-19 15:48:53 -0800 |
| commit | 9472e348190603fffed9a32e19c54a5cf17e4bcc (patch) | |
| tree | cab35f9e8f975dc7b2a0654035f45012b4fa1227 /net/core/dev.c | |
| parent | 90fcd610926a7d54d8d488faaa313109bb82f88a (diff) | |
| parent | 4debb9ea116cb46ea91819d0886915f59df58544 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4dc01e26f158..2fdd7e27e22d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1190,7 +1190,7 @@ int __skb_linearize(struct sk_buff *skb, int gfp_mask) #define HARD_TX_LOCK(dev, cpu) { \ if ((dev->features & NETIF_F_LLTX) == 0) { \ - spin_lock(&dev->xmit_lock); \ + spin_lock_irq(&dev->xmit_lock); \ dev->xmit_lock_owner = cpu; \ } \ } @@ -1198,7 +1198,7 @@ int __skb_linearize(struct sk_buff *skb, int gfp_mask) #define HARD_TX_UNLOCK(dev) { \ if ((dev->features & NETIF_F_LLTX) == 0) { \ dev->xmit_lock_owner = -1; \ - spin_unlock(&dev->xmit_lock); \ + spin_unlock_irq(&dev->xmit_lock); \ } \ } |