diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-07-13 11:51:40 +0100 |
|---|---|---|
| committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-07-13 11:51:40 +0100 |
| commit | 5b5d0e704880addfd979c262e6441f126708539c (patch) | |
| tree | 1b3bff6cd378c858ab245de3a40c3510d4ba4745 /include/linux/dccp.h | |
| parent | 2013c7e35aeba39777f9b3eef8a70207b3931152 (diff) | |
| download | op-kernel-dev-5b5d0e704880addfd979c262e6441f126708539c.zip op-kernel-dev-5b5d0e704880addfd979c262e6441f126708539c.tar.gz | |
dccp: Upgrade NDP count from 3 to 6 bytes
RFC 4340, 7.7 specifies up to 6 bytes for the NDP Count option, whereas the code
is currently limited to up to 3 bytes. This seems to be a relict of an earlier
draft version and is brought up to date by the patch.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Diffstat (limited to 'include/linux/dccp.h')
| -rw-r--r-- | include/linux/dccp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index aa07370..6080449 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h @@ -364,8 +364,6 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) /* FIXME: for now we're default to 1 but it should really be 0 */ #define DCCPF_INITIAL_SEND_NDP_COUNT 1 -#define DCCP_NDP_LIMIT 0xFFFFFF - /** * struct dccp_minisock - Minimal DCCP connection representation * @@ -437,7 +435,7 @@ extern int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, struct sk_buff *skb); struct dccp_options_received { - u32 dccpor_ndp; /* only 24 bits */ + u64 dccpor_ndp:48; u32 dccpor_timestamp; u32 dccpor_timestamp_echo; u32 dccpor_elapsed_time; @@ -533,7 +531,7 @@ struct dccp_sock { __u16 dccps_r_ack_ratio; __u16 dccps_pcslen; __u16 dccps_pcrlen; - unsigned long dccps_ndp_count; + __u64 dccps_ndp_count:48; unsigned long dccps_rate_last; struct dccp_minisock dccps_minisock; struct dccp_ackvec *dccps_hc_rx_ackvec; |
