From 8599369ef7f231a817b4b3b47af1c6c9b3cf312b Mon Sep 17 00:00:00 2001 From: Michal Miroslaw Date: Fri, 28 Sep 2007 14:45:06 -0700 Subject: [PATCH] --- yaml --- r: 66825 b: refs/heads/master c: c6a8f648362a5d8b934f4267b0ab9f255c130ab0 h: refs/heads/master i: 66823: 0803bda1748e01e3ddeda7da42e789558a85f616 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink_log.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fc09c242cd78..d8e29fd24326 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d63b043d955c261f4f413eecf6e0488d7459acd4 +refs/heads/master: c6a8f648362a5d8b934f4267b0ab9f255c130ab0 diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c index 0fa17421bbc6..d2e811f46067 100644 --- a/trunk/net/netfilter/nfnetlink_log.c +++ b/trunk/net/netfilter/nfnetlink_log.c @@ -301,8 +301,8 @@ nfulnl_set_flags(struct nfulnl_instance *inst, u_int16_t flags) return 0; } -static struct sk_buff *nfulnl_alloc_skb(unsigned int inst_size, - unsigned int pkt_size) +static struct sk_buff * +nfulnl_alloc_skb(unsigned int inst_size, unsigned int pkt_size) { struct sk_buff *skb; unsigned int n; @@ -365,7 +365,8 @@ __nfulnl_flush(struct nfulnl_instance *inst) __nfulnl_send(inst); } -static void nfulnl_timer(unsigned long data) +static void +nfulnl_timer(unsigned long data) { struct nfulnl_instance *inst = (struct nfulnl_instance *)data;