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>
Šī revīzija ir iekļauta:

revīziju iesūtīja
David S. Miller

vecāks
8734e485fe
revīzija
a8acce6aa5
@@ -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;
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user