Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4bf665c authored by David S. Miller's avatar David S. Miller
Browse files

virtio_net: Fix mis-merge. 



Pointed out by Stephen Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dad1e54b

drivers/net/virtio_net.c

+0 −1
Original line number Diff line number Diff line
@@ -329,7 +329,6 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp) 
	struct skb_vnet_hdr *hdr;

	int err;



	sg_init_table(sg, 2);

	skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);

	if (unlikely(!skb))

		return -ENOMEM;