---

yaml --- r: 195073 b: refs/heads/master c: 736d58e h: refs/heads/master i: 195071: 38bb1ea v: v3
git-mirror · May 13, 2010 · fd6710c · fd6710c
1 parent fab1488
commit fd6710c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -148,7 +148,6 @@ static void localtime_3(struct xtm *r, time_t time)
 	}
 
 	r->month    = i + 1;
-	return;
 }
 
 static bool
-Original file line number
+Diff line change
@@ Expand Up / @@ -461,7 +461,6 @@ __ipq_rcv_skb(struct sk_buff *skb) @@
     	if (flags & NLM_F_ACK)
     		netlink_ack(skb, nlh, 0);
-    	return;
     }
     static void
@@ Expand Down @@