Module Name: src
Committed By: christos
Date: Sat Jul 19 21:22:58 UTC 2014
Modified Files:
src/sys/net/npf: npf_conn.c
Log Message:
gcc-4.8 complains about not being able to inline
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_conn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_conn.c
diff -u src/sys/net/npf/npf_conn.c:1.2 src/sys/net/npf/npf_conn.c:1.3
--- src/sys/net/npf/npf_conn.c:1.2 Sat Jul 19 16:59:01 2014
+++ src/sys/net/npf/npf_conn.c Sat Jul 19 17:22:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_conn.c,v 1.2 2014/07/19 20:59:01 rmind Exp $ */
+/* $NetBSD: npf_conn.c,v 1.3 2014/07/19 21:22:58 christos Exp $ */
/*-
* Copyright (c) 2014 Mindaugas Rasiukevicius <rmind at netbsd org>
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.2 2014/07/19 20:59:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.3 2014/07/19 21:22:58 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -332,7 +332,7 @@ npf_conn_conkey(const npf_cache_t *npc,
return true;
}
-static __always_inline void
+static __inline void
connkey_set_addr(npf_connkey_t *key, const npf_addr_t *naddr, const int di)
{
const u_int alen = key->ck_key[0] & 0xffff;
@@ -342,7 +342,7 @@ connkey_set_addr(npf_connkey_t *key, con
memcpy(addr, naddr, alen);
}
-static __always_inline void
+static __inline void
connkey_set_id(npf_connkey_t *key, const uint16_t id, const int di)
{
const uint32_t oid = key->ck_key[1];
