diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/net/sctp/sctp.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/net/sctp/sctp.h')
| -rw-r--r-- | include/net/sctp/sctp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 8a6d5297de16..78740ec57d5d 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -227,8 +227,7 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics); | |||
| 227 | #endif /* !TEST_FRAME */ | 227 | #endif /* !TEST_FRAME */ |
| 228 | 228 | ||
| 229 | /* sctp mib definitions */ | 229 | /* sctp mib definitions */ |
| 230 | enum | 230 | enum { |
| 231 | { | ||
| 232 | SCTP_MIB_NUM = 0, | 231 | SCTP_MIB_NUM = 0, |
| 233 | SCTP_MIB_CURRESTAB, /* CurrEstab */ | 232 | SCTP_MIB_CURRESTAB, /* CurrEstab */ |
| 234 | SCTP_MIB_ACTIVEESTABS, /* ActiveEstabs */ | 233 | SCTP_MIB_ACTIVEESTABS, /* ActiveEstabs */ |