Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / drivers / net / ethernet / chelsio / cxgb4vf / sge.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index adebbf849cdbfab8c3f639a97ae80077aec84493..bdfa80ca5e317cee72c925a4112bdeaaf2551799 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -1952,7 +1952,7 @@ static void sge_rx_timer_cb(unsigned long data)
                        struct sge_fl *fl = s->egr_map[id];
 
                        clear_bit(id, s->starving_fl);
-                       smp_mb__after_clear_bit();
+                       smp_mb__after_atomic();
 
                        /*
                         * Since we are accessing fl without a lock there's a