diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /include/linux/inet_diag.h | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'include/linux/inet_diag.h')
| -rw-r--r-- | include/linux/inet_diag.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index 80b480c97532..abf5028db981 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h | |||
| @@ -98,9 +98,10 @@ enum { | |||
| 98 | INET_DIAG_VEGASINFO, | 98 | INET_DIAG_VEGASINFO, |
| 99 | INET_DIAG_CONG, | 99 | INET_DIAG_CONG, |
| 100 | INET_DIAG_TOS, | 100 | INET_DIAG_TOS, |
| 101 | INET_DIAG_TCLASS, | ||
| 101 | }; | 102 | }; |
| 102 | 103 | ||
| 103 | #define INET_DIAG_MAX INET_DIAG_TOS | 104 | #define INET_DIAG_MAX INET_DIAG_TCLASS |
| 104 | 105 | ||
| 105 | 106 | ||
| 106 | /* INET_DIAG_MEM */ | 107 | /* INET_DIAG_MEM */ |