1 files changed, 19 insertions, 12 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index d63d1327b051..86436c77af03 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -522,20 +522,16 @@ static void bnx2x_func_stats_init(struct bnx2x *bp)
 /* should be called under stats_sema */
 static void __bnx2x_stats_start(struct bnx2x *bp)
 {
-        /* vfs travel through here as part of the statistics FSM, but no action
-         * is required
-         */
-        if (IS_VF(bp))
-                return;
-
-        if (bp->port.pmf)
-                bnx2x_port_stats_init(bp);
+        if (IS_PF(bp)) {
+                if (bp->port.pmf)
+                        bnx2x_port_stats_init(bp);
 
-        else if (bp->func_stx)
-                bnx2x_func_stats_init(bp);
+                else if (bp->func_stx)
+                        bnx2x_func_stats_init(bp);
 
-        bnx2x_hw_stats_post(bp);
-        bnx2x_storm_stats_post(bp);
+                bnx2x_hw_stats_post(bp);
+                bnx2x_storm_stats_post(bp);
+        }
 
         bp->stats_started = true;
 }
@@ -1997,3 +1993,14 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,
                        estats->mac_discard);
         }
 }
+
+void bnx2x_stats_safe_exec(struct bnx2x *bp,
+                           void (func_to_exec)(void *cookie),
+                           void *cookie){
+        if (down_timeout(&bp->stats_sema, HZ/10))
+                BNX2X_ERR("Unable to acquire stats lock\n");
+        bnx2x_stats_comp(bp);
+        func_to_exec(cookie);
+        __bnx2x_stats_start(bp);
+        up(&bp->stats_sema);
+}