[libnetfilter_conntrack] bsf: remove unnecessary function inline

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Fri Nov 28 02:37:51 CET 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=dc5162d5f1d4f4ea7e331f1f10a5f8128200025f
commit dc5162d5f1d4f4ea7e331f1f10a5f8128200025f
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Nov 28 02:35:09 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Nov 28 02:35:09 2008 +0100

    bsf: remove unnecessary function inline
    
    This patch removes unnecessary function inlining in the BSF code
    generation. There is not reason to get any significant performance
    improvement in an operation that should be done in the
    initialization path.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  dc5162d5f1d4f4ea7e331f1f10a5f8128200025f (commit)
      from  20506e55b12ba22b761a1ad84dc8a47ce8c82f2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc5162d5f1d4f4ea7e331f1f10a5f8128200025f
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Nov 28 02:35:09 2008 +0100

    bsf: remove unnecessary function inline
    
    This patch removes unnecessary function inlining in the BSF code
    generation. There is not reason to get any significant performance
    improvement in an operation that should be done in the
    initialization path.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 src/conntrack/bsf.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
This patch removes unnecessary function inlining in the BSF code
generation. There is not reason to get any significant performance
improvement in an operation that should be done in the
initialization path.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/conntrack/bsf.c b/src/conntrack/bsf.c
index f2d14f8..9a0dfff 100644
--- a/src/conntrack/bsf.c
+++ b/src/conntrack/bsf.c
@@ -35,7 +35,7 @@ static inline void show_filter(struct sock_filter *this, int size) {}
 
 #define NEW_POS(x) (sizeof(x)/sizeof(struct sock_filter))
 
-static inline int
+static int
 nfct_bsf_load_payload_offset(struct sock_filter *this, int pos)
 {
 	struct sock_filter __code = {
@@ -46,7 +46,7 @@ nfct_bsf_load_payload_offset(struct sock_filter *this, int pos)
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_find_attr(struct sock_filter *this, int attr, int pos)
 {
 	struct sock_filter __code[] = {
@@ -71,7 +71,7 @@ struct jump {
 	u_int8_t jf;
 };
 
-static inline int
+static int
 nfct_bsf_cmp_k_stack(struct sock_filter *this, int k, 
 	       int jump_true, int pos, struct stack *s)
 {
@@ -89,7 +89,7 @@ nfct_bsf_cmp_k_stack(struct sock_filter *this, int k,
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_alu_and(struct sock_filter *this, int k, int pos)
 {
 	struct sock_filter __code = {
@@ -100,7 +100,7 @@ nfct_bsf_alu_and(struct sock_filter *this, int k, int pos)
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_add_attr_data_offset(struct sock_filter *this, int pos)
 {
 	struct sock_filter __code = {
@@ -112,7 +112,7 @@ nfct_bsf_add_attr_data_offset(struct sock_filter *this, int pos)
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_x_equal_a(struct sock_filter *this, int pos)
 {
 	struct sock_filter __code = {
@@ -122,7 +122,7 @@ nfct_bsf_x_equal_a(struct sock_filter *this, int pos)
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_load_attr(struct sock_filter *this, int word_size, int pos)
 {
 	struct sock_filter __code = {
@@ -135,7 +135,7 @@ nfct_bsf_load_attr(struct sock_filter *this, int word_size, int pos)
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_ret_verdict(struct sock_filter *this, int verdict, int pos)
 {
 	struct sock_filter __code = {
@@ -146,7 +146,7 @@ nfct_bsf_ret_verdict(struct sock_filter *this, int verdict, int pos)
 	return NEW_POS(__code);
 }
 
-static inline int
+static int
 nfct_bsf_jump_to(struct sock_filter *this, int line, int pos)
 {
 	struct sock_filter __code = {



More information about the netfilter-cvslog mailing list