Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / include / net / inet6_connection_sock.h

diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index 3207e58ee0198a6d185eea363950e15329c98ea6..1866a676c8105045db3e9d973fe07dfb74422c41 100644 (file)
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -23,7 +23,7 @@ struct sock;
 struct sockaddr;
 
 extern int inet6_csk_bind_conflict(const struct sock *sk,
-                                  const struct inet_bind_bucket *tb);
+                                  const struct inet_bind_bucket *tb, bool relax);
 
 extern struct dst_entry* inet6_csk_route_req(struct sock *sk,
                                             const struct request_sock *req);