git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[safe/jmp/linux-2.6]
/
drivers
/
block
/
aoe
/
aoeblk.c
diff --git
a/drivers/block/aoe/aoeblk.c
b/drivers/block/aoe/aoeblk.c
index
aa69556
..
b82654e
100644
(file)
--- a/
drivers/block/aoe/aoeblk.c
+++ b/
drivers/block/aoe/aoeblk.c
@@
-158,9
+158,9
@@
aoeblk_release(struct inode *inode, struct file *filp)
static int
aoeblk_make_request(struct request_queue *q, struct bio *bio)
{
static int
aoeblk_make_request(struct request_queue *q, struct bio *bio)
{
+ struct sk_buff_head queue;
struct aoedev *d;
struct buf *buf;
struct aoedev *d;
struct buf *buf;
- struct sk_buff *sl;
ulong flags;
blk_queue_bounce(q, &bio);
ulong flags;
blk_queue_bounce(q, &bio);
@@
-213,11
+213,11
@@
aoeblk_make_request(struct request_queue *q, struct bio *bio)
list_add_tail(&buf->bufs, &d->bufq);
aoecmd_work(d);
list_add_tail(&buf->bufs, &d->bufq);
aoecmd_work(d);
-
sl = d->sendq_hd
;
-
d->sendq_hd = d->sendq_tl = NULL
;
+
__skb_queue_head_init(&queue)
;
+
skb_queue_splice_init(&d->sendq, &queue)
;
spin_unlock_irqrestore(&d->lock, flags);
spin_unlock_irqrestore(&d->lock, flags);
- aoenet_xmit(
sl
);
+ aoenet_xmit(
&queue
);
return 0;
}
return 0;
}