diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /net/dccp/feat.h | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'net/dccp/feat.h')
| -rw-r--r-- | net/dccp/feat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/feat.h b/net/dccp/feat.h index 2c373ad7edcf..177f7dee4d10 100644 --- a/net/dccp/feat.h +++ b/net/dccp/feat.h | |||
| @@ -30,7 +30,7 @@ static inline int dccp_feat_is_reserved(const u8 feat) | |||
| 30 | { | 30 | { |
| 31 | return (feat > DCCPF_DATA_CHECKSUM && | 31 | return (feat > DCCPF_DATA_CHECKSUM && |
| 32 | feat < DCCPF_MIN_CCID_SPECIFIC) || | 32 | feat < DCCPF_MIN_CCID_SPECIFIC) || |
| 33 | feat == DCCPF_RESERVED; | 33 | feat == DCCPF_RESERVED; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | /* feature negotiation knows only these four option types (RFC 4340, sec. 6) */ | 36 | /* feature negotiation knows only these four option types (RFC 4340, sec. 6) */ |