diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-03-16 15:25:02 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-03-16 15:25:02 +0000 |
| commit | cba07183cc76b06a5ef2b20eef70d203dc5bcd5d (patch) | |
| tree | e9847236fac724bbe929a5f2da2ad074ac47f120 /drivers/net/pppoe.c | |
| parent | 1fb968ea5a15b9ff31c6345c3c4aad523985e024 (diff) | |
| parent | 44655588a0b361afa15761b5c58f5a558c1c181c (diff) | |
| download | kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.zip kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.gz kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.bz2 | |
Merge branch 'cm-10.1-experimental' into HEAD
Diffstat (limited to 'drivers/net/pppoe.c')
| -rw-r--r-- | drivers/net/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index bc9a4bb..1161584 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -576,7 +576,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; } |