tcp/dccp: constify send_synack and send_reset socket argument

None of these functions need to change the socket, make it
const.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-09-29 07:42:39 -07:00 committed by David S. Miller
parent 4c7e622ddf
commit a00e74442b
7 changed files with 14 additions and 14 deletions

View File

@ -34,9 +34,9 @@ struct request_sock_ops {
char *slab_name; char *slab_name;
int (*rtx_syn_ack)(const struct sock *sk, int (*rtx_syn_ack)(const struct sock *sk,
struct request_sock *req); struct request_sock *req);
void (*send_ack)(struct sock *sk, struct sk_buff *skb, void (*send_ack)(const struct sock *sk, struct sk_buff *skb,
struct request_sock *req); struct request_sock *req);
void (*send_reset)(struct sock *sk, void (*send_reset)(const struct sock *sk,
struct sk_buff *skb); struct sk_buff *skb);
void (*destructor)(struct request_sock *req); void (*destructor)(struct request_sock *req);
void (*syn_ack_timeout)(const struct request_sock *req); void (*syn_ack_timeout)(const struct request_sock *req);

View File

@ -229,7 +229,7 @@ void dccp_v4_send_check(struct sock *sk, struct sk_buff *skb);
int dccp_retransmit_skb(struct sock *sk); int dccp_retransmit_skb(struct sock *sk);
void dccp_send_ack(struct sock *sk); void dccp_send_ack(struct sock *sk);
void dccp_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, void dccp_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
struct request_sock *rsk); struct request_sock *rsk);
void dccp_send_sync(struct sock *sk, const u64 seq, void dccp_send_sync(struct sock *sk, const u64 seq,

View File

@ -527,7 +527,7 @@ out:
return err; return err;
} }
static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) static void dccp_v4_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
{ {
int err; int err;
const struct iphdr *rxiph; const struct iphdr *rxiph;

View File

@ -234,7 +234,7 @@ static void dccp_v6_reqsk_destructor(struct request_sock *req)
kfree_skb(inet_rsk(req)->pktopts); kfree_skb(inet_rsk(req)->pktopts);
} }
static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) static void dccp_v6_ctl_send_reset(const struct sock *sk, struct sk_buff *rxskb)
{ {
const struct ipv6hdr *rxip6h; const struct ipv6hdr *rxip6h;
struct sk_buff *skb; struct sk_buff *skb;

View File

@ -236,7 +236,7 @@ int dccp_child_process(struct sock *parent, struct sock *child,
EXPORT_SYMBOL_GPL(dccp_child_process); EXPORT_SYMBOL_GPL(dccp_child_process);
void dccp_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, void dccp_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
struct request_sock *rsk) struct request_sock *rsk)
{ {
DCCP_BUG("DCCP-ACK packets are never sent in LISTEN/RESPOND state"); DCCP_BUG("DCCP-ACK packets are never sent in LISTEN/RESPOND state");

View File

@ -576,7 +576,7 @@ EXPORT_SYMBOL(tcp_v4_send_check);
* Exception: precedence violation. We do not implement it in any case. * Exception: precedence violation. We do not implement it in any case.
*/ */
static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
{ {
const struct tcphdr *th = tcp_hdr(skb); const struct tcphdr *th = tcp_hdr(skb);
struct { struct {
@ -795,7 +795,7 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
inet_twsk_put(tw); inet_twsk_put(tw);
} }
static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
struct request_sock *req) struct request_sock *req)
{ {
/* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV /* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV

View File

@ -70,8 +70,8 @@
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb); static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb);
static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
struct request_sock *req); struct request_sock *req);
static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb); static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);
@ -724,7 +724,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {
.queue_hash_add = inet6_csk_reqsk_queue_hash_add, .queue_hash_add = inet6_csk_reqsk_queue_hash_add,
}; };
static void tcp_v6_send_response(struct sock *sk, struct sk_buff *skb, u32 seq, static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 seq,
u32 ack, u32 win, u32 tsval, u32 tsecr, u32 ack, u32 win, u32 tsval, u32 tsecr,
int oif, struct tcp_md5sig_key *key, int rst, int oif, struct tcp_md5sig_key *key, int rst,
u8 tclass, u32 label) u8 tclass, u32 label)
@ -823,7 +823,7 @@ static void tcp_v6_send_response(struct sock *sk, struct sk_buff *skb, u32 seq,
kfree_skb(buff); kfree_skb(buff);
} }
static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)
{ {
const struct tcphdr *th = tcp_hdr(skb); const struct tcphdr *th = tcp_hdr(skb);
u32 seq = 0, ack_seq = 0; u32 seq = 0, ack_seq = 0;
@ -894,7 +894,7 @@ release_sk1:
#endif #endif
} }
static void tcp_v6_send_ack(struct sock *sk, struct sk_buff *skb, u32 seq, static void tcp_v6_send_ack(const struct sock *sk, struct sk_buff *skb, u32 seq,
u32 ack, u32 win, u32 tsval, u32 tsecr, int oif, u32 ack, u32 win, u32 tsval, u32 tsecr, int oif,
struct tcp_md5sig_key *key, u8 tclass, struct tcp_md5sig_key *key, u8 tclass,
u32 label) u32 label)
@ -917,7 +917,7 @@ static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb)
inet_twsk_put(tw); inet_twsk_put(tw);
} }
static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb,
struct request_sock *req) struct request_sock *req)
{ {
/* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV /* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV