]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: connection: avoid a build warning on FreeBSD with SO_USER_COOKIE
authorWilly Tarreau <w@1wt.eu>
Fri, 8 Oct 2021 13:52:27 +0000 (15:52 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 8 Oct 2021 15:21:48 +0000 (17:21 +0200)
It was brough by an unneeded addition of a local variable after a test
in commit f7f53afcf ("BUILD/MEDIUM: tcp: set-mark setting support for
FreeBSD."). No backport needed.

include/haproxy/connection.h

index 84c6645a7c9df6c7b676b49d36c3c1cb30cc8ee3..17dad4bdaf15f819e2b4a4bf5c55fb17059907f2 100644 (file)
@@ -488,8 +488,7 @@ static inline void conn_set_mark(const struct connection *conn, int mark)
 #if defined(SO_MARK)
        setsockopt(conn->handle.fd, SOL_SOCKET, SO_MARK, &mark, sizeof(mark));
 #elif defined(SO_USER_COOKIE)
-       uint32_t mval = (uint32_t)mark;
-       setsockopt(conn->handle.fd, SOL_SOCKET, SO_USER_COOKIE, &mval, sizeof(mval));
+       setsockopt(conn->handle.fd, SOL_SOCKET, SO_USER_COOKIE, &mark, sizeof(mark));
 #elif defined(SO_RTABLE)
        setsockopt(conn->handle.fd, SOL_SOCKET, SO_RTABLE, &mark, sizeof(mark));
 #endif