Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index bc80fc1d576e5ae27d7c99c7ae7778fa5f2e72f2..be37235af55d2d282b162adcd9d0e599cd5e6b3e 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -652,6 +652,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
                                   tun->tfiles[tun->numqueues - 1]);
                ntfile = rtnl_dereference(tun->tfiles[index]);
                ntfile->queue_index = index;
+               ntfile->xdp_rxq.queue_index = index;
                rcu_assign_pointer(tun->tfiles[tun->numqueues - 1],
                                   NULL);