diff --git a/[refs] b/[refs] index fe1f5fc9ac74..cb21f8710d83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4364d5f96eed7994a2c625bd9216656e55fba0cb +refs/heads/master: 92bb73ea2c434618a68a58a2f3a5c3fd0b660d18 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 89776c592151..b1cbfbcff789 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -352,7 +352,7 @@ static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb) u32 numqueues = 0; rcu_read_lock(); - numqueues = tun->numqueues; + numqueues = ACCESS_ONCE(tun->numqueues); txq = skb_get_rxhash(skb); if (txq) {