From fd6710c18d93cf17ef2d9ddd80fcc0ba0d7d4f51 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 13 May 2010 15:16:27 +0200
Subject: [PATCH] --- yaml --- r: 195073 b: refs/heads/master c:
 736d58e3a2245ac2779fe0f278f8735bcf33ca8d h: refs/heads/master i:   195071:
 38bb1eab7bbbaeb5370b5450ff131200fb9d37ad v: v3

---
 [refs]                                     | 2 +-
 trunk/net/ipv4/netfilter/ip_queue.c        | 1 -
 trunk/net/ipv6/netfilter/ip6_queue.c       | 1 -
 trunk/net/netfilter/nf_conntrack_netlink.c | 1 -
 trunk/net/netfilter/nf_queue.c             | 1 -
 trunk/net/netfilter/xt_time.c              | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ab58ad050074..59dccda501ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 654d0fbdc8fe1041918741ed5b6abc8ad6b4c1d8
+refs/heads/master: 736d58e3a2245ac2779fe0f278f8735bcf33ca8d
diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c
index c838238104f5..a4e5fc5df4bf 100644
--- a/trunk/net/ipv4/netfilter/ip_queue.c
+++ b/trunk/net/ipv4/netfilter/ip_queue.c
@@ -461,7 +461,6 @@ __ipq_rcv_skb(struct sk_buff *skb)
 
 	if (flags & NLM_F_ACK)
 		netlink_ack(skb, nlh, 0);
-	return;
 }
 
 static void
diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c
index 8656eb75520c..8c201743d96d 100644
--- a/trunk/net/ipv6/netfilter/ip6_queue.c
+++ b/trunk/net/ipv6/netfilter/ip6_queue.c
@@ -462,7 +462,6 @@ __ipq_rcv_skb(struct sk_buff *skb)
 
 	if (flags & NLM_F_ACK)
 		netlink_ack(skb, nlh, 0);
-	return;
 }
 
 static void
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
index 961fb6a85294..c42ff6aa441d 100644
--- a/trunk/net/netfilter/nf_conntrack_netlink.c
+++ b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -2109,7 +2109,6 @@ static void __exit ctnetlink_exit(void)
 
 	nfnetlink_subsys_unregister(&ctnl_exp_subsys);
 	nfnetlink_subsys_unregister(&ctnl_subsys);
-	return;
 }
 
 module_init(ctnetlink_init);
diff --git a/trunk/net/netfilter/nf_queue.c b/trunk/net/netfilter/nf_queue.c
index c49ef219899e..0b1103c0b1f3 100644
--- a/trunk/net/netfilter/nf_queue.c
+++ b/trunk/net/netfilter/nf_queue.c
@@ -279,7 +279,6 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
 	}
 	rcu_read_unlock();
 	kfree(entry);
-	return;
 }
 EXPORT_SYMBOL(nf_reinject);
 
diff --git a/trunk/net/netfilter/xt_time.c b/trunk/net/netfilter/xt_time.c
index 79234bb19d05..c48975ff8ea2 100644
--- a/trunk/net/netfilter/xt_time.c
+++ b/trunk/net/netfilter/xt_time.c
@@ -148,7 +148,6 @@ static void localtime_3(struct xtm *r, time_t time)
 	}
 
 	r->month    = i + 1;
-	return;
 }
 
 static bool