From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Jun 2011 05:29:08 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v5.15~24626^2~399
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f6ec8d697c08963d83880ccd35c13c5ace716ea;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c
---

9f6ec8d697c08963d83880ccd35c13c5ace716ea
diff --cc net/netfilter/ipvs/ip_vs_core.c
index 2200bae1d4dd,24c28d238dcb..e33d48cae9fd
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@@ -1945,7 -1945,8 +1945,8 @@@ static void __net_exit __ip_vs_dev_clea
  {
  	EnterFunction(2);
  	net_ipvs(net)->enable = 0;	/* Disable packet reception */
+ 	smp_wmb();
 -	__ip_vs_sync_cleanup(net);
 +	ip_vs_sync_net_cleanup(net);
  	LeaveFunction(2);
  }