diff options
| author |   Guillaume Nault <g.nault@alphalink.fr> | 2015-11-19 12:53:21 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-11-20 11:31:26 -0500 |
| commit | a8acce6aa584aa731a2bed240bcd8dc955f01414 (patch) | |
| tree | 6be6919c595cac8d7a394fdcc29a5f9e4d68e4b2 /drivers/net/ppp/pppoe.c | |
| parent | ppp: don't set sk_state to PPPOX_ZOMBIE in pppoe_disc_rcv() (diff) | |
| download | linux-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/pppoe.c')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 1dedfbf1d423..277e6827d7cd 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -311,7 +311,7 @@ static void pppoe_flush_dev(struct net_device *dev) lock_sock(sk); if (po->pppoe_dev == dev && - sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { + sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) { pppox_unbind_sock(sk); sk->sk_state_change(sk); po->pppoe_dev = NULL; @@ -775,7 +775,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd, struct pppox_sock *relay_po; err = -EBUSY; - if (sk->sk_state & (PPPOX_BOUND | PPPOX_ZOMBIE | PPPOX_DEAD)) + if (sk->sk_state & (PPPOX_BOUND | PPPOX_DEAD)) break; err = -ENOTCONN; |