| Message ID | 1443587045.32531.17.camel@edumazet-glaptop2.roam.corp.google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2015-09-29 at 21:24 -0700, Eric Dumazet wrote: > From: Eric Dumazet <edumazet@google.com> > > tcp_v6_md5_do_lookup() now takes a const socket, even if > CONFIG_TCP_MD5SIG is not set. > > Fixes: b83e3deb974c ("tcp: md5: constify tcp_md5_do_lookup() socket argument") > From: Eric Dumazet <edumazet@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> > Reported-by: kbuild test robot <fengguang.wu@intel.com> > --- > net/ipv6/tcp_ipv6.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c > index 0ac64f47f8821ce7da103ecc7391ba7e..2ae95e1d03e1c0d5149c9f6fa7cf94d9 100644 > --- a/net/ipv6/tcp_ipv6.c > +++ b/net/ipv6/tcp_ipv6.c > @@ -82,7 +82,7 @@ static const struct inet_connection_sock_af_ops ipv6_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, > +static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk, > const struct in6_addr *addr) > { > return NULL; > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Tue, 29 Sep 2015 21:24:05 -0700 > From: Eric Dumazet <edumazet@google.com> > > tcp_v6_md5_do_lookup() now takes a const socket, even if > CONFIG_TCP_MD5SIG is not set. > > Fixes: b83e3deb974c ("tcp: md5: constify tcp_md5_do_lookup() socket argument") > From: Eric Dumazet <edumazet@google.com> > Reported-by: kbuild test robot <fengguang.wu@intel.com> Applied, thanks Eric. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 0ac64f47f8821ce7da103ecc7391ba7e..2ae95e1d03e1c0d5149c9f6fa7cf94d9 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -82,7 +82,7 @@ static const struct inet_connection_sock_af_ops ipv6_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, +static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(const struct sock *sk, const struct in6_addr *addr) { return NULL;