diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-09 23:32:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-09 23:32:37 -0700 |
| commit | 8e602aee7e5eb7b9fc4df986477ec2b4a9c1f3f1 (patch) | |
| tree | 96ed4fa7e9aa3f0b64a03af119d526fa94e2c66f /include/linux | |
| parent | 48fe688958ed01aa3adbc63ef9f90bd1a849cdb7 (diff) | |
| parent | f477fdbefcc8394c37f0c6b16c0a12d07b2c0e72 (diff) | |
Merge bk://ppc.bkbits.net/for-linus-ppp
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_pppox.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 9d2206b1d06f..405747fba490 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -147,13 +147,14 @@ extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */ extern int pppox_channel_ioctl(struct ppp_channel *pc, unsigned int cmd, unsigned long arg); -/* PPPoE socket states */ +/* PPPoX socket states */ enum { PPPOX_NONE = 0, /* initial state */ PPPOX_CONNECTED = 1, /* connection established ==TCP_ESTABLISHED */ PPPOX_BOUND = 2, /* bound to ppp device */ PPPOX_RELAY = 4, /* forwarding is enabled */ - PPPOX_DEAD = 8 + PPPOX_ZOMBIE = 8, /* dead, but still bound to ppp device */ + PPPOX_DEAD = 16 /* dead, useless, please clean me up!*/ }; extern struct ppp_channel_ops pppoe_chan_ops; |