diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-11-20 11:31:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-20 11:31:27 -0500 |
| commit | 7521cd43ef04e0353ba499f528c91c34108a1169 (patch) | |
| tree | 6be6919c595cac8d7a394fdcc29a5f9e4d68e4b2 /include/linux | |
| parent | Merge branch 'mlxsw-vlan' (diff) | |
| parent | ppp: remove PPPOX_ZOMBIE socket state (diff) | |
Merge branch 'ppp-kill-zombie-state'
Guillaume Nault says:
====================
ppp: Remove PPPOX_ZOMBIE socket state
Several issues have been found lately wrt. the PPPOX_ZOMBIE socket
state. This state is now only set upon reception of a PADT to stop
further transmissions. However this is redundant with the PADT
workqueue mechanism introduced by 287f3a943fef ("pppoe: Use workqueue
to die properly when a PADT is received").
We can thus simplify pppox socket state handling by getting rid of
PPPOX_ZOMBIE entirely.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_pppox.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index b49cf923becc..ba7a9b0c7c57 100644 --- 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!*/ }; |