SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-05 00:18:10 +00:00
parent eff43bb1fd
commit a2b5593ce1
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
76 changed files with 1704 additions and 1876 deletions
Download patch file Download diff file Expand all files Collapse all files

8
usr.sbin/vmd/vionet.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: vionet.c,v 1.6 2023/09/26 01:53:54 dv Exp $ */
/* $OpenBSD: vionet.c,v 1.7 2024/01/03 03:14:16 dv Exp $ */
/*
* Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
@ -506,7 +506,7 @@ vionet_notify_tx(struct virtio_dev *dev)
uint16_t idx, pkt_desc_idx, hdr_desc_idx, dxx, cnt;
size_t pktsz, chunk_size = 0;
ssize_t dhcpsz = 0;
int num_enq, ofs, spc = 0;
int ofs, spc = 0;
char *vr = NULL, *pkt = NULL, *dhcppkt = NULL;
struct vionet_dev *vionet = &dev->vionet;
struct vring_desc *desc, *pkt_desc, *hdr_desc;
@ -531,8 +531,6 @@ vionet_notify_tx(struct virtio_dev *dev)
avail = (struct vring_avail *)(vr + vq_info->vq_availoffset);
used = (struct vring_used *)(vr + vq_info->vq_usedoffset);
num_enq = 0;
idx = vq_info->last_avail & VIONET_QUEUE_MASK;
if ((avail->idx & VIONET_QUEUE_MASK) == idx)
@ -662,8 +660,6 @@ vionet_notify_tx(struct virtio_dev *dev)
vq_info->last_avail = avail->idx & VIONET_QUEUE_MASK;
idx = (idx + 1) & VIONET_QUEUE_MASK;
num_enq++;
free(pkt);
pkt = NULL;
}