| Message ID | 1465465167-4698-1-git-send-email-pl@kamp.de |
|---|---|
| State | New |
| Headers | show |
On 2016年06月09日 17:39, Peter Lieven wrote: > commit fefe2a78 accidently dropped the code path for injecting > raw packets. This feature is needed for sending gratuitous ARPs > after an incoming migration has completed. The result is increased > network downtime for vservers where the network card is not virtio-net > with the VIRTIO_NET_F_GUEST_ANNOUNCE feature. > > Fixes: fefe2a78abde932e0f340b21bded2c86def1d242 > Cc: qemu-stable@nongnu.org > Cc: hongyang.yang@easystack.cn > Signed-off-by: Peter Lieven <pl@kamp.de> > --- > v1->v2: assert that only raw packets with a plain buffer come in. [Paolo] > v2->v3: nc_senv_compat can take care of raw packets [Paolo, Jason] > > net/net.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/net.c b/net/net.c > index 5f3e5a9..75bb177 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -722,7 +722,7 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender, > return 0; > } > > - if (nc->info->receive_iov) { > + if (nc->info->receive_iov && !(flags & QEMU_NET_PACKET_FLAG_RAW)) { > ret = nc->info->receive_iov(nc, iov, iovcnt); > } else { > ret = nc_sendv_compat(nc, iov, iovcnt, flags); Applied to -net. Thanks
diff --git a/net/net.c b/net/net.c index 5f3e5a9..75bb177 100644 --- a/net/net.c +++ b/net/net.c @@ -722,7 +722,7 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender, return 0; } - if (nc->info->receive_iov) { + if (nc->info->receive_iov && !(flags & QEMU_NET_PACKET_FLAG_RAW)) { ret = nc->info->receive_iov(nc, iov, iovcnt); } else { ret = nc_sendv_compat(nc, iov, iovcnt, flags);
commit fefe2a78 accidently dropped the code path for injecting raw packets. This feature is needed for sending gratuitous ARPs after an incoming migration has completed. The result is increased network downtime for vservers where the network card is not virtio-net with the VIRTIO_NET_F_GUEST_ANNOUNCE feature. Fixes: fefe2a78abde932e0f340b21bded2c86def1d242 Cc: qemu-stable@nongnu.org Cc: hongyang.yang@easystack.cn Signed-off-by: Peter Lieven <pl@kamp.de> --- v1->v2: assert that only raw packets with a plain buffer come in. [Paolo] v2->v3: nc_senv_compat can take care of raw packets [Paolo, Jason] net/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)