projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a1032f
)
virtio_net: missing sg_init_table
author
Shirley Ma
<
[email protected]
>
Mon, 29 Mar 2010 15:19:15 +0000
(15:19 +0000)
committer
David S. Miller
<
[email protected]
>
Tue, 13 Apr 2010 05:00:34 +0000
(22:00 -0700)
Add missing sg_init_table for sg_set_buf in virtio_net which
induced in defer skb patch.
Reported-by: Thomas Müller <
[email protected]
>
Tested-by: Thomas Müller <
[email protected]
>
Signed-off-by: Shirley Ma <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/virtio_net.c
patch
|
blob
|
history
diff --git
a/drivers/net/virtio_net.c
b/drivers/net/virtio_net.c
index 6fb783ce20b987fe6b74377a3fa96a0e0a8be18f..b0577dd1a42dc838eae1e9ca6bb14bc018192b4d 100644
(file)
--- a/
drivers/net/virtio_net.c
+++ b/
drivers/net/virtio_net.c
@@
-327,6
+327,7
@@
static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
struct scatterlist sg[2];
int err;
+ sg_init_table(sg, 2);
skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
if (unlikely(!skb))
return -ENOMEM;
@@
-352,6
+353,7
@@
static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp)
char *p;
int i, err, offset;
+ sg_init_table(sg, MAX_SKB_FRAGS + 2);
/* page in sg[MAX_SKB_FRAGS + 1] is list tail */
for (i = MAX_SKB_FRAGS + 1; i > 1; --i) {
first = get_a_page(vi, gfp);