libata: switch to using block layer tagging support

[linux-2.6-omap-h63xx.git] / include / linux / dccp.h

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index aa0737019e37da6e759ea95e026088cbbfc6518d..6080449fbec942b7a1340c4a0c131f1957b33e81 100644 (file)
--- 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;