diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-03-09 06:55:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 15:47:01 -0700 |
| commit | 9baddeb8c6c7faa7da8706ad629f09ca221850c1 (patch) | |
| tree | a313ee611dc6f77604dbf188e8ed9770df0ec409 /drivers/net/bnx2x_main.c | |
| parent | 0efc22f3afa5d8f070a33fea06162d7d9d518e38 (diff) | |
| download | talos-op-linux-9baddeb8c6c7faa7da8706ad629f09ca221850c1.tar.gz talos-op-linux-9baddeb8c6c7faa7da8706ad629f09ca221850c1.zip | |
bnx2x: change smp_mb() comment to conform the true
Access to fp->tx_bp_prod is protected by __netif_tx_lock,
smp_mb() is not needed for that.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
| -rw-r--r-- | drivers/net/bnx2x_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index ae62b67aa597..6c042a72d6cc 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -11428,9 +11428,12 @@ static netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(bnx2x_tx_avail(fp) < MAX_SKB_FRAGS + 3)) { netif_tx_stop_queue(txq); - /* We want bnx2x_tx_int to "see" the updated tx_bd_prod - if we put Tx into XOFF state. */ + + /* paired memory barrier is in bnx2x_tx_int(), we have to keep + * ordering of set_bit() in netif_tx_stop_queue() and read of + * fp->bd_tx_cons */ smp_mb(); + fp->eth_q_stats.driver_xoff++; if (bnx2x_tx_avail(fp) >= MAX_SKB_FRAGS + 3) netif_tx_wake_queue(txq); |
