[conntrack-tools] ftfw: remove useless ftfw_run invocation in the alive alarm handler

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Wed Nov 26 00:31:39 CET 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=e6832ed088eac06fee6316dd2ecb8003aa635f17
commit e6832ed088eac06fee6316dd2ecb8003aa635f17
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Wed Nov 26 00:30:27 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Wed Nov 26 00:30:27 2008 +0100

    ftfw: remove useless ftfw_run invocation in the alive alarm handler
    
    This patch removes a forced run of the transmission queue.
    This is not required since we currently have an event descriptor
    that indicates when to give a queue run to push pending messages.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  e6832ed088eac06fee6316dd2ecb8003aa635f17 (commit)
      from  22353928caf9c821e70d15c2dd827c8725f6ac40 (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 e6832ed088eac06fee6316dd2ecb8003aa635f17
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Wed Nov 26 00:30:27 2008 +0100

    ftfw: remove useless ftfw_run invocation in the alive alarm handler
    
    This patch removes a forced run of the transmission queue.
    This is not required since we currently have an event descriptor
    that indicates when to give a queue run to push pending messages.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 src/sync-ftfw.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
This patch removes a forced run of the transmission queue.
This is not required since we currently have an event descriptor
that indicates when to give a queue run to push pending messages.

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

diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c
index 598945f..abba1fe 100644
--- a/src/sync-ftfw.c
+++ b/src/sync-ftfw.c
@@ -120,8 +120,6 @@ static void tx_queue_add_ctlmsg(uint32_t flags, uint32_t from, uint32_t to)
 	write_evfd(STATE_SYNC(evfd));
 }
 
-static void ftfw_run(void);
-
 /* this function is called from the alarm framework */
 static void do_alive_alarm(struct alarm_block *a, void *data)
 {
@@ -133,10 +131,6 @@ static void do_alive_alarm(struct alarm_block *a, void *data)
 		ack_from_set = 0;
 	} else
 		tx_queue_add_ctlmsg(NET_F_ALIVE, 0, 0);
-
-	/* TODO: no need for buffered send, extracted from run_sync() */
-	ftfw_run();
-	mcast_buffered_pending_netmsg(STATE_SYNC(mcast_client));
 }
 
 static int ftfw_init(void)



More information about the netfilter-cvslog mailing list