52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
|
From: Guillaume Nault <g.nault@alphalink.fr>
|
||
|
|
Date: Thu, 19 Nov 2015 12:53:21 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/ppp/pppoe.c
|
||
|
|
+++ b/drivers/net/ppp/pppoe.c
|
||
|
|
@@ -311,7 +311,7 @@ static void pppoe_flush_dev(struct net_d
|
||
|
|
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 *so
|
||
|
|
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;
|
||
|
|
--- 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;
|
||
|
|
}
|
||
|
|
--- a/include/linux/if_pppox.h
|
||
|
|
+++ b/include/linux/if_pppox.h
|
||
|
|
@@ -91,7 +91,6 @@ enum {
|
||
|
|
PPPOX_CONNECTED = 1, /* connection established ==TCP_ESTABLISHED */
|
||
|
|
PPPOX_BOUND = 2, /* bound to ppp device */
|
||
|
|
PPPOX_RELAY = 4, /* forwarding is enabled */
|
||
|
|
- PPPOX_ZOMBIE = 8, /* dead, but still bound to ppp device */
|
||
|
|
PPPOX_DEAD = 16 /* dead, useless, please clean me up!*/
|
||
|
|
};
|
||
|
|
|