diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-20 14:13:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-20 14:13:34 -0400 |
| commit | 3779298b81cd9a2531cec93e3beefc1acdb01382 (patch) | |
| tree | 7182f6b13a789c6353e59d26fdc0781f843ca9a8 /drivers | |
| parent | 8444cf712c5f71845cba9dc30d8f530ff0d5ff83 (diff) | |
| parent | ee05d6939ed17b55e9c2466af32c208e0d547eb8 (diff) | |
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 29e850a7a2f9..7c8008225ee3 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
| @@ -243,7 +243,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, | |||
| 243 | int r, nlogs = 0; | 243 | int r, nlogs = 0; |
| 244 | 244 | ||
| 245 | while (datalen > 0) { | 245 | while (datalen > 0) { |
| 246 | if (unlikely(headcount >= VHOST_NET_MAX_SG)) { | 246 | if (unlikely(seg >= VHOST_NET_MAX_SG)) { |
| 247 | r = -ENOBUFS; | 247 | r = -ENOBUFS; |
| 248 | goto err; | 248 | goto err; |
| 249 | } | 249 | } |