Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368247
b: refs/heads/master
c: f7de0b9
h: refs/heads/master
i:
  368245: fb1976d
  368243: eccd3f9
  368239: 019362b
v: v3
  • Loading branch information
Wei Yongjun authored and David S. Miller committed Mar 13, 2013
1 parent 192184c commit 3b83753
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df594563fc8503d8473341fc67fc890c65c3a7c9
refs/heads/master: f7de0b936811296f7d88d378af80ad14b061769a
2 changes: 0 additions & 2 deletions trunk/drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,12 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
{
struct tun_file *ntfile;
struct tun_struct *tun;
struct net_device *dev;

tun = rtnl_dereference(tfile->tun);

if (tun && !tfile->detached) {
u16 index = tfile->queue_index;
BUG_ON(index >= tun->numqueues);
dev = tun->dev;

rcu_assign_pointer(tun->tfiles[index],
tun->tfiles[tun->numqueues - 1]);
Expand Down

0 comments on commit 3b83753

Please sign in to comment.