diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.h')
-rw-r--r-- | net/dccp/ccids/ccid3.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h index 7884159937a..1773a8dd36d 100644 --- a/net/dccp/ccids/ccid3.h +++ b/net/dccp/ccids/ccid3.h | |||
@@ -70,13 +70,6 @@ enum ccid3_options { | |||
70 | TFRC_OPT_RECEIVE_RATE = 194, | 70 | TFRC_OPT_RECEIVE_RATE = 194, |
71 | }; | 71 | }; |
72 | 72 | ||
73 | /* TFRC sender states */ | ||
74 | enum ccid3_hc_tx_states { | ||
75 | TFRC_SSTATE_NO_SENT = 1, | ||
76 | TFRC_SSTATE_NO_FBACK, | ||
77 | TFRC_SSTATE_FBACK, | ||
78 | }; | ||
79 | |||
80 | /** struct ccid3_hc_tx_sock - CCID3 sender half-connection socket | 73 | /** struct ccid3_hc_tx_sock - CCID3 sender half-connection socket |
81 | * | 74 | * |
82 | * @x - Current sending rate in 64 * bytes per second | 75 | * @x - Current sending rate in 64 * bytes per second |
@@ -87,7 +80,7 @@ enum ccid3_hc_tx_states { | |||
87 | * @s - Packet size in bytes | 80 | * @s - Packet size in bytes |
88 | * @t_rto - Nofeedback Timer setting in usecs | 81 | * @t_rto - Nofeedback Timer setting in usecs |
89 | * @t_ipi - Interpacket (send) interval (RFC 3448, 4.6) in usecs | 82 | * @t_ipi - Interpacket (send) interval (RFC 3448, 4.6) in usecs |
90 | * @state - Sender state, one of %ccid3_hc_tx_states | 83 | * @feedback - Whether feedback has been received or not |
91 | * @last_win_count - Last window counter sent | 84 | * @last_win_count - Last window counter sent |
92 | * @t_last_win_count - Timestamp of earliest packet with | 85 | * @t_last_win_count - Timestamp of earliest packet with |
93 | * last_win_count value sent | 86 | * last_win_count value sent |
@@ -105,7 +98,7 @@ struct ccid3_hc_tx_sock { | |||
105 | u32 t_rto; | 98 | u32 t_rto; |
106 | u32 t_ipi; | 99 | u32 t_ipi; |
107 | u16 s; | 100 | u16 s; |
108 | enum ccid3_hc_tx_states state:8; | 101 | bool feedback:1; |
109 | u8 last_win_count; | 102 | u8 last_win_count; |
110 | ktime_t t_last_win_count; | 103 | ktime_t t_last_win_count; |
111 | struct timer_list no_feedback_timer; | 104 | struct timer_list no_feedback_timer; |