Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2e4b3de authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

tcp: MD5 operations should be const 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98147d52

include/linux/tcp.h

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ struct tcp_request_sock { 
	struct inet_request_sock 	req;

#ifdef CONFIG_TCP_MD5SIG

	/* Only used by TCP MD5 Signature so far. */

	struct tcp_request_sock_ops	*af_specific;

	const struct tcp_request_sock_ops *af_specific;

#endif

	u32			 	rcv_isn;

	u32			 	snt_isn;
@@ -401,9 +401,9 @@ struct tcp_sock { 


#ifdef CONFIG_TCP_MD5SIG

/* TCP AF-Specific parts; only used by MD5 Signature support so far */

	struct tcp_sock_af_ops	*af_specific;

	const struct tcp_sock_af_ops	*af_specific;



/* TCP MD5 Signagure Option information */

/* TCP MD5 Signature Option information */

	struct tcp_md5sig_info	*md5sig_info;

#endif

};

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ struct request_sock_ops tcp_request_sock_ops __read_mostly = { 
};



#ifdef CONFIG_TCP_MD5SIG

static struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {

static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {

	.md5_lookup	=	tcp_v4_reqsk_md5_lookup,

	.calc_md5_hash	=	tcp_v4_md5_hash_skb,

};
@@ -1774,7 +1774,7 @@ struct inet_connection_sock_af_ops ipv4_specific = { 
};



#ifdef CONFIG_TCP_MD5SIG

static struct tcp_sock_af_ops tcp_sock_ipv4_specific = {

static const struct tcp_sock_af_ops tcp_sock_ipv4_specific = {

	.md5_lookup		= tcp_v4_md5_lookup,

	.calc_md5_hash		= tcp_v4_md5_hash_skb,

	.md5_add		= tcp_v4_md5_add_func,

net/ipv6/tcp_ipv6.c

+5 −5
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb); 
static struct inet_connection_sock_af_ops ipv6_mapped;

static struct inet_connection_sock_af_ops ipv6_specific;

#ifdef CONFIG_TCP_MD5SIG

static struct tcp_sock_af_ops tcp_sock_ipv6_specific;

static struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific;

static const struct tcp_sock_af_ops tcp_sock_ipv6_specific;

static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific;

#else

static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,

						   struct in6_addr *addr)
@@ -894,7 +894,7 @@ struct request_sock_ops tcp6_request_sock_ops __read_mostly = { 
};



#ifdef CONFIG_TCP_MD5SIG

static struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {

static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {

	.md5_lookup	=	tcp_v6_reqsk_md5_lookup,

	.calc_md5_hash	=	tcp_v6_md5_hash_skb,

};
@@ -1780,7 +1780,7 @@ static struct inet_connection_sock_af_ops ipv6_specific = { 
};



#ifdef CONFIG_TCP_MD5SIG

static struct tcp_sock_af_ops tcp_sock_ipv6_specific = {

static const struct tcp_sock_af_ops tcp_sock_ipv6_specific = {

	.md5_lookup	=	tcp_v6_md5_lookup,

	.calc_md5_hash	=	tcp_v6_md5_hash_skb,

	.md5_add	=	tcp_v6_md5_add_func,
@@ -1812,7 +1812,7 @@ static struct inet_connection_sock_af_ops ipv6_mapped = { 
};



#ifdef CONFIG_TCP_MD5SIG

static struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = {

static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = {

	.md5_lookup	=	tcp_v4_md5_lookup,

	.calc_md5_hash	=	tcp_v4_md5_hash_skb,

	.md5_add	=	tcp_v6_md5_add_func,