diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2005-01-19 21:24:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2005-01-19 21:24:38 -0800 |
| commit | fe3cc7ac5f5a044c04ef2ad2975940cc0ccbdd92 (patch) | |
| tree | 5e4b0b25a126b3b313f82097cb6b4aa8f3b4ed30 /net/core/dev.c | |
| parent | 8edee05783bfca65fb395f829fe74705047d65f9 (diff) | |
Cset exclude: davem@nuts.davemloft.net|ChangeSet|20050120063740|10274
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 2fdd7e27e22d..4dc01e26f158 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_irq(&dev->xmit_lock); \ + spin_lock(&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_irq(&dev->xmit_lock); \ + spin_unlock(&dev->xmit_lock); \ } \ } |
