aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-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 6d16a9070ff0..117fb093dcaf 100644
--- a/net/dccp/ccid.h
+++ b/net/dccp/ccid.h
@@ -73,7 +73,7 @@ struct ccid_operations {
73 int (*ccid_hc_tx_send_packet)(struct sock *sk, 73 int (*ccid_hc_tx_send_packet)(struct sock *sk,
74 struct sk_buff *skb); 74 struct sk_buff *skb);
75 void (*ccid_hc_tx_packet_sent)(struct sock *sk, 75 void (*ccid_hc_tx_packet_sent)(struct sock *sk,
76 int more, unsigned int len); 76 unsigned int len);
77 void (*ccid_hc_rx_get_info)(struct sock *sk, 77 void (*ccid_hc_rx_get_info)(struct sock *sk,
78 struct tcp_info *info); 78 struct tcp_info *info);
79 void (*ccid_hc_tx_get_info)(struct sock *sk, 79 void (*ccid_hc_tx_get_info)(struct sock *sk,
@@ -144,10 +144,10 @@ static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk,
144} 144}
145 145
146static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk, 146static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk,
147 int more, unsigned int len) 147 unsigned int len)
148{ 148{
149 if (ccid->ccid_ops->ccid_hc_tx_packet_sent != NULL) 149 if (ccid->ccid_ops->ccid_hc_tx_packet_sent != NULL)
150 ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, more, len); 150 ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, len);
151} 151}
152 152
153static inline void ccid_hc_rx_packet_recv(struct ccid *ccid, struct sock *sk, 153static 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 dc18172b1e59..d850e291f87c 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -151,7 +151,7 @@ out:
151 sock_put(sk); 151 sock_put(sk);
152} 152}
153 153
154static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) 154static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len)
155{ 155{
156 struct dccp_sock *dp = dccp_sk(sk); 156 struct dccp_sock *dp = dccp_sk(sk);
157 struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk); 157 struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index c3f3a25bbd7a..3060a60ed5ab 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -351,8 +351,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
351 return 0; 351 return 0;
352} 352}
353 353
354static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, 354static void ccid3_hc_tx_packet_sent(struct sock *sk, unsigned int len)
355 unsigned int len)
356{ 355{
357 struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk); 356 struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);
358 357
diff --git a/net/dccp/output.c b/net/dccp/output.c
index 6993a9338cf7..a988fe9ffcba 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -304,7 +304,7 @@ void dccp_write_xmit(struct sock *sk, int block)
304 dcb->dccpd_type = DCCP_PKT_DATA; 304 dcb->dccpd_type = DCCP_PKT_DATA;
305 305
306 err = dccp_transmit_skb(sk, skb); 306 err = dccp_transmit_skb(sk, skb);
307 ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len); 307 ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, len);
308 if (err) 308 if (err)
309 DCCP_BUG("err=%d after ccid_hc_tx_packet_sent", 309 DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",
310 err); 310 err);