From: David S. Miller <davem@davemloft.net>
Date: Thu, 3 Dec 2009 21:23:12 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
X-Git-Tag: v2.6.33-rc1~388^2~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=424eff975192553a9ea8bfd51bf65039ffb356ef;p=~emulex%2Finfiniband.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
---

424eff975192553a9ea8bfd51bf65039ffb356ef
diff --cc net/ipv4/netfilter/ip_queue.c
index 884f0859cb3,9f078709195..49ad44712f4
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@@ -497,10 -497,9 +497,9 @@@ ipq_rcv_nl_event(struct notifier_block 
  {
  	struct netlink_notify *n = ptr;
  
- 	if (event == NETLINK_URELEASE &&
- 	    n->protocol == NETLINK_FIREWALL && n->pid) {
+ 	if (event == NETLINK_URELEASE && n->protocol == NETLINK_FIREWALL) {
  		write_lock_bh(&queue_lock);
 -		if ((n->net == &init_net) && (n->pid == peer_pid))
 +		if ((net_eq(n->net, &init_net)) && (n->pid == peer_pid))
  			__ipq_reset();
  		write_unlock_bh(&queue_lock);
  	}
diff --cc net/ipv6/netfilter/ip6_queue.c
index 4c7a18abcaf,47a3623e711..db4d5725cce
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@@ -499,10 -499,9 +499,9 @@@ ipq_rcv_nl_event(struct notifier_block 
  {
  	struct netlink_notify *n = ptr;
  
- 	if (event == NETLINK_URELEASE &&
- 	    n->protocol == NETLINK_IP6_FW && n->pid) {
+ 	if (event == NETLINK_URELEASE && n->protocol == NETLINK_IP6_FW) {
  		write_lock_bh(&queue_lock);
 -		if ((n->net == &init_net) && (n->pid == peer_pid))
 +		if ((net_eq(n->net, &init_net)) && (n->pid == peer_pid))
  			__ipq_reset();
  		write_unlock_bh(&queue_lock);
  	}