---

yaml --- r: 323160 b: refs/heads/master c: 2b018d5 h: refs/heads/master v: v3
git-mirror · Sep 22, 2012 · 4468b1d · 4468b1d
1 parent d619a9b
commit 4468b1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b121fd28d071c766dddab743031ba6cfe9be68e
+refs/heads/master: 2b018d57ff18e5405823e5cb59651a5b4d946d7b
diff --git a/trunk/drivers/net/ppp/pppoe.c b/trunk/drivers/net/ppp/pppoe.c
@@ -570,7 +570,7 @@ static int pppoe_release(struct socket *sock)
 
 	po = pppox_sk(sk);
 
-	if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
+	if (sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) {
 		dev_put(po->pppoe_dev);
 		po->pppoe_dev = NULL;
 	}