aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/dccp/ccid.h6
-rw-r--r--net/dccp/ccids/ccid2.c2
-rw-r--r--net/dccp/ccids/ccid3.c3
-rw-r--r--net/dccp/output.c2
4 files changed, 6 insertions, 7 deletions
diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h
index bce517c99996..430a3c24f970 100644
--- a/net/dccp/ccid.h
+++ b/net/dccp/ccid.h
@@ -71,7 +71,7 @@ struct ccid_operations {
71 int (*ccid_hc_tx_send_packet)(struct sock *sk, 71 int (*ccid_hc_tx_send_packet)(struct sock *sk,
72 struct sk_buff *skb); 72 struct sk_buff *skb);
73 void (*ccid_hc_tx_packet_sent)(struct sock *sk, 73 void (*ccid_hc_tx_packet_sent)(struct sock *sk,
74 int more, unsigned int len); 74 unsigned int len);
75 void (*ccid_hc_rx_get_info)(struct sock *sk, 75 void (*ccid_hc_rx_get_info)(struct sock *sk,
76 struct tcp_info *info); 76 struct tcp_info *info);
77 void (*ccid_hc_tx_get_info)(struct sock *sk, 77 void (*ccid_hc_tx_get_info)(struct sock *sk,
@@ -139,10 +139,10 @@ static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk,
139} 139}
140 140
141static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk, 141static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk,
142 int more, unsigned int len) 142 unsigned int len)
143{ 143{
144 if (ccid->ccid_ops->ccid_hc_tx_packet_sent != NULL) 144 if (ccid->ccid_ops->ccid_hc_tx_packet_sent != NULL)
145 ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, more, len); 145 ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, len);
146} 146}
147 147
148static inline void ccid_hc_rx_packet_recv(struct ccid *ccid, struct sock *sk, 148static inline void ccid_hc_rx_packet_recv(struct ccid *ccid, struct sock *sk,
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 9728bbf0acea..f56ab68a4b78 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -221,7 +221,7 @@ static void ccid2_start_rto_timer(struct sock *sk)
221 jiffies + hctx->rto); 221 jiffies + hctx->rto);
222} 222}
223 223
224static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) 224static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len)
225{ 225{
226 struct dccp_sock *dp = dccp_sk(sk); 226 struct dccp_sock *dp = dccp_sk(sk);
227 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); 227 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index e7db8a4ee642..c1cc66edfad4 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -356,8 +356,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
356 return 0; 356 return 0;
357} 357}
358 358
359static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, 359static void ccid3_hc_tx_packet_sent(struct sock *sk, unsigned int len)
360 unsigned int len)
361{ 360{
362 struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); 361 struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
363 362
diff --git a/net/dccp/output.c b/net/dccp/output.c
index 9888f61f9b0b..be65bc30e201 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -301,7 +301,7 @@ void dccp_write_xmit(struct sock *sk, int block)
301 dcb->dccpd_type = DCCP_PKT_DATA; 301 dcb->dccpd_type = DCCP_PKT_DATA;
302 302
303 err = dccp_transmit_skb(sk, skb); 303 err = dccp_transmit_skb(sk, skb);
304 ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len); 304 ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, len);
305 if (err) 305 if (err)
306 DCCP_BUG("err=%d after ccid_hc_tx_packet_sent", 306 DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",
307 err); 307 err);