git.openpandora.org
/
pandora-kernel.git
/ 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
[pandora-kernel.git]
/
drivers
/
vhost
/
net.c
diff --git
a/drivers/vhost/net.c
b/drivers/vhost/net.c
index
861af4a
..
4b4da5b
100644
(file)
--- a/
drivers/vhost/net.c
+++ b/
drivers/vhost/net.c
@@
-246,7
+246,7
@@
static int get_rx_bufs(struct vhost_virtqueue *vq,
int r, nlogs = 0;
while (datalen > 0) {
- if (unlikely(seg >=
VHOST_NET_MAX_SG
)) {
+ if (unlikely(seg >=
UIO_MAXIOV
)) {
r = -ENOBUFS;
goto err;
}