diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-05-03 05:58:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-05-03 05:58:45 -0700 |
| commit | db6b3bf0e23de740e58670db1fb11e66275fba2c (patch) | |
| tree | 61412c742cd9d512adf63887674608da3853c739 /include/net | |
| parent | a063296dc6bbca150095cd87266d1c021bb45843 (diff) | |
| parent | c969a2a3d4cd89da6653ba333135da5ffc94f63f (diff) | |
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sctp/constants.h | 5 | ||||
| -rw-r--r-- | include/net/sctp/user.h | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h index 2abcf517b897..c611176fbd44 100644 --- a/include/net/sctp/constants.h +++ b/include/net/sctp/constants.h @@ -231,11 +231,6 @@ const char *sctp_pname(const sctp_subtype_t); /* primitives */ /* This is a table of printable names of sctp_state_t's. */ extern const char *sctp_state_tbl[], *sctp_evttype_tbl[], *sctp_status_tbl[]; -/* SCTP reachability state for each address */ -#define SCTP_ADDR_NOHB 4 -#define SCTP_ADDR_REACHABLE 2 -#define SCTP_ADDR_NOT_REACHABLE 1 - /* Maximum chunk length considering padding requirements. */ enum { SCTP_MAX_CHUNK_LEN = ((1<<16) - sizeof(__u32)) }; diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 45f96479510f..290f9969d3cb 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h @@ -1,7 +1,7 @@ /* SCTP kernel reference Implementation + * (C) Copyright IBM Corp. 2001, 2004 * Copyright (c) 1999-2000 Cisco, Inc. * Copyright (c) 1999-2001 Motorola, Inc. - * Copyright (c) 2001-2003 International Business Machines, Corp. * Copyright (c) 2002 Intel Corp. * * This file is part of the SCTP kernel reference Implementation @@ -246,7 +246,7 @@ struct sctp_paddr_change { * event that happened to the address. They include: */ enum sctp_spc_state { - SCTP_ADDR_REACHABLE, + SCTP_ADDR_AVAILABLE, SCTP_ADDR_UNREACHABLE, SCTP_ADDR_REMOVED, SCTP_ADDR_ADDED, |