From 39066a8e18ab8b25847bb36ed6a07ee7977bd1c9 Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Thu, 24 Mar 2011 11:47:51 -0700 Subject: [PATCH] --- yaml --- r: 242658 b: refs/heads/master c: 6f71d7927c9a9efb7d7e9e6d227d5e246a9c5bd7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_ethtool.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 9fa3ffcd8af2..f6e58acf6751 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54a4fe5499542f083ff282048c6a5afb8d4aca16 +refs/heads/master: 6f71d7927c9a9efb7d7e9e6d227d5e246a9c5bd7 diff --git a/trunk/drivers/net/mlx4/en_ethtool.c b/trunk/drivers/net/mlx4/en_ethtool.c index 62ace6c72b42..d54b7abf0225 100644 --- a/trunk/drivers/net/mlx4/en_ethtool.c +++ b/trunk/drivers/net/mlx4/en_ethtool.c @@ -45,20 +45,7 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_dev *mdev = priv->mdev; - switch (mdev->dev->rev_id) { - case 0xa0: - if (dev->dev_id >= MLX4_EN_CX3_LOW_ID && dev->dev_id <= MLX4_EN_CX3_HIGH_ID) - sprintf(drvinfo->driver, DRV_NAME " (%s_CX-3)", mdev->dev->board_id); - else - sprintf(drvinfo->driver, DRV_NAME " (%s_CX)", mdev->dev->board_id); - break; - case 0xb0: - sprintf(drvinfo->driver, DRV_NAME " (%s_CX-2)", mdev->dev->board_id); - break; - default: - sprintf(drvinfo->driver, DRV_NAME " (%s)", mdev->dev->board_id); - break; - } + strncpy(drvinfo->driver, DRV_NAME, 32); strncpy(drvinfo->version, DRV_VERSION " (" DRV_RELDATE ")", 32); sprintf(drvinfo->fw_version, "%d.%d.%d", (u16) (mdev->dev->caps.fw_ver >> 32),