diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:56:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:56:47 -0400 |
| commit | eb693d2994eb762b2201aead31066265ab0be20b (patch) | |
| tree | 424e1e7f3d272d0fd5888435176b386594ce121f /net/core/dev.c | |
| parent | 6dec3cf5cdb600f39b9eac3349f6bf50eab87731 (diff) | |
| parent | 01d40f28b125e0a9aa0ec24642be67fc4c5dfaff (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 37c881070963..9066c874e273 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -1259,6 +1259,8 @@ int dev_queue_xmit(struct sk_buff *skb) | |||
| 1259 | if (skb_checksum_help(skb, 0)) | 1259 | if (skb_checksum_help(skb, 0)) |
| 1260 | goto out_kfree_skb; | 1260 | goto out_kfree_skb; |
| 1261 | 1261 | ||
| 1262 | spin_lock_prefetch(&dev->queue_lock); | ||
| 1263 | |||
| 1262 | /* Disable soft irqs for various locks below. Also | 1264 | /* Disable soft irqs for various locks below. Also |
| 1263 | * stops preemption for RCU. | 1265 | * stops preemption for RCU. |
| 1264 | */ | 1266 | */ |