diff options
| author | Yevgeny Petrilin | 2011-10-18 03:50:42 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-10-19 09:42:26 +0200 |
| commit | f3a9d1f25dfeadf22c775880633a587cc6778872 (patch) | |
| tree | 6777487a57d874090e118fad60a6c43f4cd259bc /drivers/net | |
| parent | mlx4: Fix vlan table overflow (diff) | |
| download | kernel-qcow2-linux-f3a9d1f25dfeadf22c775880633a587cc6778872.tar.gz kernel-qcow2-linux-f3a9d1f25dfeadf22c775880633a587cc6778872.tar.xz kernel-qcow2-linux-f3a9d1f25dfeadf22c775880633a587cc6778872.zip | |
mlx4_en: Controlling FCS header removal
Canceling FCS removal where FW allows for better alignment
of incoming data.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 46a0df9afc3c..c47d73707f2c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c @@ -806,6 +806,10 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn, qpn, ring->cqn, context); context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma); + /* Cancel FCS removal if FW allows */ + if (mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_FCS_KEEP) + context->param3 |= cpu_to_be32(1 << 29); + err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, context, qp, state); if (err) { mlx4_qp_remove(mdev->dev, qp); diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c index 7eb8ba822e97..ed452ddfe342 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/drivers/net/ethernet/mellanox/mlx4/fw.c @@ -101,6 +101,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u64 flags) [25] = "Router support", [30] = "IBoE support", [32] = "Unicast loopback support", + [34] = "FCS header control", [38] = "Wake On LAN support", [40] = "UDP RSS support", [41] = "Unicast VEP steering support", |