diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-17 01:13:19 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-17 01:13:19 +0100 |
| commit | 7cd2802d7496c1fc76f42dc045b48cc16d11df39 (patch) | |
| tree | 41c33f5944bbc686a489801762eb126e07049b81 /net/vmw_vsock | |
| parent | Merge branch 'fib-merge-nl-policies' (diff) | |
| parent | Merge tag 'audit-pr-20211216' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-7cd2802d7496c1fc76f42dc045b48cc16d11df39.tar.xz linux-7cd2802d7496c1fc76f42dc045b48cc16d11df39.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 59ee1be5a6dd..ec2c2afbf0d0 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1299,7 +1299,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t, space_available = virtio_transport_space_update(sk, pkt); /* Update CID in case it has changed after a transport reset event */ - vsk->local_addr.svm_cid = dst.svm_cid; + if (vsk->local_addr.svm_cid != VMADDR_CID_ANY) + vsk->local_addr.svm_cid = dst.svm_cid; if (space_available) sk->sk_write_space(sk); |