lkml.org 
[lkml]   [2007]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 2.6.20 14/14] nfnetlink_log: micro-optimization: inst->skb != NULL in __nfulnl_send()
    Patch updated to apply after a new version of 13/14:

    No other function calls __nfulnl_send() with inst->skb == NULL than nfulnl_timer().

    Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

    --- linux-2.6.20/net/netfilter/nfnetlink_log.c.12 2007-02-14 12:27:09.000000000 +0100
    +++ linux-2.6.20/net/netfilter/nfnetlink_log.c 2007-02-14 12:53:04.000000000 +0100
    @@ -373,9 +373,6 @@ __nfulnl_send(struct nfulnl_instance *in
    {
    int status;

    - if (!inst->skb)
    - return 0;
    -
    if (inst->qlen > 1)
    inst->lastnlh->nlmsg_type = NLMSG_DONE;

    @@ -399,7 +396,8 @@ static void nfulnl_timer(unsigned long d
    UDEBUG("timer function called, flushing buffer\n");

    spin_lock_bh(&inst->lock);
    - __nfulnl_send(inst);
    + if (inst->skb)
    + __nfulnl_send(inst);
    spin_unlock_bh(&inst->lock);
    instance_put(inst);
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-02-14 13:01    [W:3.081 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site