diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-04-10 22:15:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-11 18:29:09 -0400 |
commit | bb29624614c2afe2873ee8ee97cf09df42701694 (patch) | |
tree | aea85e4cd6643fb47beba987849378c0e80166a0 | |
parent | 8ad50d96db58c58ba67ec1c6f9d3dae0db52338a (diff) |
inet: Remove unused send_check length argument
inet: Remove unused send_check length argument
This patch removes the unused length argument from the send_check
function in struct inet_connection_sock_af_ops.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Yinghai <yinghai.lu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/inet_connection_sock.h | 3 | ||||
-rw-r--r-- | include/net/tcp.h | 2 | ||||
-rw-r--r-- | net/dccp/dccp.h | 2 | ||||
-rw-r--r-- | net/dccp/ipv4.c | 2 | ||||
-rw-r--r-- | net/dccp/ipv6.c | 3 | ||||
-rw-r--r-- | net/dccp/output.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 2 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
9 files changed, 9 insertions, 11 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 696d6e4ce68a..52c8b8b8a0b9 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h | |||
@@ -37,8 +37,7 @@ struct tcp_congestion_ops; | |||
37 | */ | 37 | */ |
38 | struct inet_connection_sock_af_ops { | 38 | struct inet_connection_sock_af_ops { |
39 | int (*queue_xmit)(struct sk_buff *skb, int ipfragok); | 39 | int (*queue_xmit)(struct sk_buff *skb, int ipfragok); |
40 | void (*send_check)(struct sock *sk, int len, | 40 | void (*send_check)(struct sock *sk, struct sk_buff *skb); |
41 | struct sk_buff *skb); | ||
42 | int (*rebuild_header)(struct sock *sk); | 41 | int (*rebuild_header)(struct sock *sk); |
43 | int (*conn_request)(struct sock *sk, struct sk_buff *skb); | 42 | int (*conn_request)(struct sock *sk, struct sk_buff *skb); |
44 | struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb, | 43 | struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb, |
diff --git a/include/net/tcp.h b/include/net/tcp.h index 75be5a28815d..70c5159f4b36 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -423,7 +423,7 @@ extern u8 *tcp_parse_md5sig_option(struct tcphdr *th); | |||
423 | * TCP v4 functions exported for the inet6 API | 423 | * TCP v4 functions exported for the inet6 API |
424 | */ | 424 | */ |
425 | 425 | ||
426 | extern void tcp_v4_send_check(struct sock *sk, int len, | 426 | extern void tcp_v4_send_check(struct sock *sk, |
427 | struct sk_buff *skb); | 427 | struct sk_buff *skb); |
428 | 428 | ||
429 | extern int tcp_v4_conn_request(struct sock *sk, | 429 | extern int tcp_v4_conn_request(struct sock *sk, |
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 53f8e12d0c10..a10a61a1ded2 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
@@ -223,7 +223,7 @@ static inline void dccp_csum_outgoing(struct sk_buff *skb) | |||
223 | skb->csum = skb_checksum(skb, 0, (cov > skb->len)? skb->len : cov, 0); | 223 | skb->csum = skb_checksum(skb, 0, (cov > skb->len)? skb->len : cov, 0); |
224 | } | 224 | } |
225 | 225 | ||
226 | extern void dccp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb); | 226 | extern void dccp_v4_send_check(struct sock *sk, struct sk_buff *skb); |
227 | 227 | ||
228 | extern int dccp_retransmit_skb(struct sock *sk); | 228 | extern int dccp_retransmit_skb(struct sock *sk); |
229 | 229 | ||
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 52ffa1cde15a..d9b11ef8694c 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -349,7 +349,7 @@ static inline __sum16 dccp_v4_csum_finish(struct sk_buff *skb, | |||
349 | return csum_tcpudp_magic(src, dst, skb->len, IPPROTO_DCCP, skb->csum); | 349 | return csum_tcpudp_magic(src, dst, skb->len, IPPROTO_DCCP, skb->csum); |
350 | } | 350 | } |
351 | 351 | ||
352 | void dccp_v4_send_check(struct sock *sk, int unused, struct sk_buff *skb) | 352 | void dccp_v4_send_check(struct sock *sk, struct sk_buff *skb) |
353 | { | 353 | { |
354 | const struct inet_sock *inet = inet_sk(sk); | 354 | const struct inet_sock *inet = inet_sk(sk); |
355 | struct dccp_hdr *dh = dccp_hdr(skb); | 355 | struct dccp_hdr *dh = dccp_hdr(skb); |
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 3b11e41a2929..ab1ab95946df 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -60,8 +60,7 @@ static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb, | |||
60 | return csum_ipv6_magic(saddr, daddr, skb->len, IPPROTO_DCCP, skb->csum); | 60 | return csum_ipv6_magic(saddr, daddr, skb->len, IPPROTO_DCCP, skb->csum); |
61 | } | 61 | } |
62 | 62 | ||
63 | static inline void dccp_v6_send_check(struct sock *sk, int unused_value, | 63 | static inline void dccp_v6_send_check(struct sock *sk, struct sk_buff *skb) |
64 | struct sk_buff *skb) | ||
65 | { | 64 | { |
66 | struct ipv6_pinfo *np = inet6_sk(sk); | 65 | struct ipv6_pinfo *np = inet6_sk(sk); |
67 | struct dccp_hdr *dh = dccp_hdr(skb); | 66 | struct dccp_hdr *dh = dccp_hdr(skb); |
diff --git a/net/dccp/output.c b/net/dccp/output.c index fc3f436440b4..b8d98e3c052a 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -129,7 +129,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) | |||
129 | break; | 129 | break; |
130 | } | 130 | } |
131 | 131 | ||
132 | icsk->icsk_af_ops->send_check(sk, 0, skb); | 132 | icsk->icsk_af_ops->send_check(sk, skb); |
133 | 133 | ||
134 | if (set_ack) | 134 | if (set_ack) |
135 | dccp_event_ack_sent(sk); | 135 | dccp_event_ack_sent(sk); |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index aebfd28c5089..a24995cdc4b6 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -537,7 +537,7 @@ static void __tcp_v4_send_check(struct sk_buff *skb, | |||
537 | } | 537 | } |
538 | 538 | ||
539 | /* This routine computes an IPv4 TCP checksum. */ | 539 | /* This routine computes an IPv4 TCP checksum. */ |
540 | void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb) | 540 | void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb) |
541 | { | 541 | { |
542 | struct inet_sock *inet = inet_sk(sk); | 542 | struct inet_sock *inet = inet_sk(sk); |
543 | 543 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 0dda86e72ad8..0ae7ce7a71a6 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -878,7 +878,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, | |||
878 | } | 878 | } |
879 | #endif | 879 | #endif |
880 | 880 | ||
881 | icsk->icsk_af_ops->send_check(sk, skb->len, skb); | 881 | icsk->icsk_af_ops->send_check(sk, skb); |
882 | 882 | ||
883 | if (likely(tcb->flags & TCPCB_FLAG_ACK)) | 883 | if (likely(tcb->flags & TCPCB_FLAG_ACK)) |
884 | tcp_event_ack_sent(sk, tcp_skb_pcount(skb)); | 884 | tcp_event_ack_sent(sk, tcp_skb_pcount(skb)); |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index f84c506c588a..b429dfdd69dc 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -933,7 +933,7 @@ static void __tcp_v6_send_check(struct sk_buff *skb, | |||
933 | } | 933 | } |
934 | } | 934 | } |
935 | 935 | ||
936 | static void tcp_v6_send_check(struct sock *sk, int len, struct sk_buff *skb) | 936 | static void tcp_v6_send_check(struct sock *sk, struct sk_buff *skb) |
937 | { | 937 | { |
938 | struct ipv6_pinfo *np = inet6_sk(sk); | 938 | struct ipv6_pinfo *np = inet6_sk(sk); |
939 | 939 | ||