Merge commit 'v2.6.37-rc1' into for-2.6.37

1 files changed, 7 insertions, 3 deletions

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 7434a8353e23..749f01ccd26e 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -165,8 +165,10 @@ enum {
         DCCPO_TIMESTAMP_ECHO = 42,
         DCCPO_ELAPSED_TIME = 43,
         DCCPO_MAX = 45,
-        DCCPO_MIN_CCID_SPECIFIC = 128,
-        DCCPO_MAX_CCID_SPECIFIC = 255,
+        DCCPO_MIN_RX_CCID_SPECIFIC = 128,       /* from sender to receiver */
+        DCCPO_MAX_RX_CCID_SPECIFIC = 191,
+        DCCPO_MIN_TX_CCID_SPECIFIC = 192,       /* from receiver to sender */
+        DCCPO_MAX_TX_CCID_SPECIFIC = 255,
 };
 /* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */
 #define DCCP_SINGLE_OPT_MAXLEN  253
@@ -460,7 +462,8 @@ struct dccp_ackvec;
  * @dccps_hc_rx_insert_options - receiver wants to add options when acking
  * @dccps_hc_tx_insert_options - sender wants to add options when sending
  * @dccps_server_timewait - server holds timewait state on close (RFC 4340, 8.3)
- * @dccps_xmit_timer - timer for when CCID is not ready to send
+ * @dccps_xmitlet - tasklet scheduled by the TX CCID to dequeue data packets
+ * @dccps_xmit_timer - used by the TX CCID to delay sending (rate-based pacing)
  * @dccps_syn_rtt - RTT sample from Request/Response exchange (in usecs)
  */
 struct dccp_sock {
@@ -500,6 +503,7 @@ struct dccp_sock {
         __u8                            dccps_hc_rx_insert_options:1;
         __u8                            dccps_hc_tx_insert_options:1;
         __u8                            dccps_server_timewait:1;
+        struct tasklet_struct           dccps_xmitlet;
         struct timer_list               dccps_xmit_timer;
 };