string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / include / linux / dccp.h

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 010e2d8..7434a83 100644 (file)
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -165,10 +165,8 @@ enum {
        DCCPO_TIMESTAMP_ECHO = 42,
        DCCPO_ELAPSED_TIME = 43,
        DCCPO_MAX = 45,
-       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,
+       DCCPO_MIN_CCID_SPECIFIC = 128,
+       DCCPO_MAX_CCID_SPECIFIC = 255,
 };
 /* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */
 #define DCCP_SINGLE_OPT_MAXLEN 253
@@ -197,21 +195,6 @@ enum dccp_feature_numbers {
        DCCPF_MAX_CCID_SPECIFIC = 255,
 };
 
-/* DCCP socket control message types for cmsg */
-enum dccp_cmsg_type {
-       DCCP_SCM_PRIORITY = 1,
-       DCCP_SCM_QPOLICY_MAX = 0xFFFF,
-       /* ^-- Up to here reserved exclusively for qpolicy parameters */
-       DCCP_SCM_MAX
-};
-
-/* DCCP priorities for outgoing/queued packets */
-enum dccp_packet_dequeueing_policy {
-       DCCPQ_POLICY_SIMPLE,
-       DCCPQ_POLICY_PRIO,
-       DCCPQ_POLICY_MAX
-};
-
 /* DCCP socket options */
 #define DCCP_SOCKOPT_PACKET_SIZE       1 /* XXX deprecated, without effect */
 #define DCCP_SOCKOPT_SERVICE           2
@@ -225,8 +208,6 @@ enum dccp_packet_dequeueing_policy {
 #define DCCP_SOCKOPT_CCID              13
 #define DCCP_SOCKOPT_TX_CCID           14
 #define DCCP_SOCKOPT_RX_CCID           15
-#define DCCP_SOCKOPT_QPOLICY_ID                16
-#define DCCP_SOCKOPT_QPOLICY_TXQLEN    17
 #define DCCP_SOCKOPT_CCID_RX_INFO      128
 #define DCCP_SOCKOPT_CCID_TX_INFO      192
 
@@ -475,15 +456,11 @@ struct dccp_ackvec;
  * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection)
  * @dccps_hc_tx_ccid - CCID used for the sender (or sending half-connection)
  * @dccps_options_received - parsed set of retrieved options
- * @dccps_qpolicy - TX dequeueing policy, one of %dccp_packet_dequeueing_policy
- * @dccps_tx_qlen - maximum length of the TX queue
  * @dccps_role - role of this sock, one of %dccp_role
  * @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_sync_scheduled - flag which signals "send out-of-band message soon"
- * @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_xmit_timer - timer for when CCID is not ready to send
  * @dccps_syn_rtt - RTT sample from Request/Response exchange (in usecs)
  */
 struct dccp_sock {
@@ -519,14 +496,10 @@ struct dccp_sock {
        struct ccid                     *dccps_hc_rx_ccid;
        struct ccid                     *dccps_hc_tx_ccid;
        struct dccp_options_received    dccps_options_received;
-       __u8                            dccps_qpolicy;
-       __u32                           dccps_tx_qlen;
        enum dccp_role                  dccps_role:2;
        __u8                            dccps_hc_rx_insert_options:1;
        __u8                            dccps_hc_tx_insert_options:1;
        __u8                            dccps_server_timewait:1;
-       __u8                            dccps_sync_scheduled:1;
-       struct tasklet_struct           dccps_xmitlet;
        struct timer_list               dccps_xmit_timer;
 };