[src/trunk]: src/sys/net/npf gcc-4.8 complains about not being able to inline

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86eb3842af2d
branches:  trunk
changeset: 330743:86eb3842af2d
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jul 19 21:22:58 2014 +0000

description:
gcc-4.8 complains about not being able to inline

diffstat:

 sys/net/npf/npf_conn.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 749f1b2ded6c -r 86eb3842af2d sys/net/npf/npf_conn.c
--- a/sys/net/npf/npf_conn.c    Sat Jul 19 20:59:01 2014 +0000
+++ b/sys/net/npf/npf_conn.c    Sat Jul 19 21:22:58 2014 +0000
@@ -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 @@
        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 @@
        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];