tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Guillaume Nault and committed by
David S. Miller a8acce6a 8734e485

+3 -4
+2 -2
drivers/net/ppp/pppoe.c
··· 311 311 lock_sock(sk); 312 312 313 313 if (po->pppoe_dev == dev && 314 - sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { 314 + sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) { 315 315 pppox_unbind_sock(sk); 316 316 sk->sk_state_change(sk); 317 317 po->pppoe_dev = NULL; ··· 775 775 struct pppox_sock *relay_po; 776 776 777 777 err = -EBUSY; 778 - if (sk->sk_state & (PPPOX_BOUND | PPPOX_ZOMBIE | PPPOX_DEAD)) 778 + if (sk->sk_state & (PPPOX_BOUND | PPPOX_DEAD)) 779 779 break; 780 780 781 781 err = -ENOTCONN;
+1 -1
drivers/net/ppp/pppox.c
··· 58 58 { 59 59 /* Clear connection to ppp device, if attached. */ 60 60 61 - if (sk->sk_state & (PPPOX_BOUND | PPPOX_CONNECTED | PPPOX_ZOMBIE)) { 61 + if (sk->sk_state & (PPPOX_BOUND | PPPOX_CONNECTED)) { 62 62 ppp_unregister_channel(&pppox_sk(sk)->chan); 63 63 sk->sk_state = PPPOX_DEAD; 64 64 }
-1
include/linux/if_pppox.h
··· 91 91 PPPOX_CONNECTED = 1, /* connection established ==TCP_ESTABLISHED */ 92 92 PPPOX_BOUND = 2, /* bound to ppp device */ 93 93 PPPOX_RELAY = 4, /* forwarding is enabled */ 94 - PPPOX_ZOMBIE = 8, /* dead, but still bound to ppp device */ 95 94 PPPOX_DEAD = 16 /* dead, useless, please clean me up!*/ 96 95 }; 97 96