aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp/pppox.c
diff options
context:
space:
mode:
authorGuillaume Nault <g.nault@alphalink.fr>2015-11-19 12:53:21 +0100
committerDavid S. Miller <davem@davemloft.net>2015-11-20 11:31:26 -0500
commita8acce6aa584aa731a2bed240bcd8dc955f01414 (patch)
tree6be6919c595cac8d7a394fdcc29a5f9e4d68e4b2 /drivers/net/ppp/pppox.c
parentppp: don't set sk_state to PPPOX_ZOMBIE in pppoe_disc_rcv() (diff)
downloadlinux-dev-a8acce6aa584aa731a2bed240bcd8dc955f01414.tar.xz
linux-dev-a8acce6aa584aa731a2bed240bcd8dc955f01414.zip
ppp: remove PPPOX_ZOMBIE socket state
PPPOX_ZOMBIE is never set anymore. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp/pppox.c')
-rw-r--r--drivers/net/ppp/pppox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c
index 0e1b30622477..0200de74eebc 100644
--- a/drivers/net/ppp/pppox.c
+++ b/drivers/net/ppp/pppox.c
@@ -58,7 +58,7 @@ void pppox_unbind_sock(struct sock *sk)
{
/* Clear connection to ppp device, if attached. */
- if (sk->sk_state & (PPPOX_BOUND | PPPOX_CONNECTED | PPPOX_ZOMBIE)) {
+ if (sk->sk_state & (PPPOX_BOUND | PPPOX_CONNECTED)) {
ppp_unregister_channel(&pppox_sk(sk)->chan);
sk->sk_state = PPPOX_DEAD;
}