commit bb7e95c8fd859922c6cf3ebbb3a8546007df1748
author David S. Miller <davem@davemloft.net> Tue Jul 27 21:01:35 2010 -0700
committer David S. Miller <davem@davemloft.net> Tue Jul 27 21:01:35 2010 -0700
tree 58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7
parent b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027
parent 5447080cfa3c77154498dfbf225367ac85b4c2b5

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/bnx2x/bnx2x_main.c

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 75568f1..b4ec2b0 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -6714,6 +6714,7 @@
 
 	mutex_init(&bp->port.phy_mutex);
 	mutex_init(&bp->fw_mb_mutex);
+	spin_lock_init(&bp->stats_lock);
 #ifdef BCM_CNIC
 	mutex_init(&bp->cnic_mutex);
 #endif