[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1401132152.27743.2.camel@deadeye.wl.decadent.org.uk>
Date: Mon, 26 May 2014 20:22:32 +0100
From: Ben Hutchings <ben@...adent.org.uk>
To: Amir Vadai <amirv@...lanox.com>
Cc: "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
Yevgeny Petrilin <yevgenyp@...lanox.com>,
Or Gerlitz <ogerlitz@...lanox.com>,
Carol Soto <clsoto@...ux.vnet.ibm.com>
Subject: Re: [PATCH net-next 1/2] net/mlx4_core: Deprecate use_prio module
parameter
On Mon, 2014-05-19 at 11:37 +0300, Amir Vadai wrote:
> It was used for steering by user priority for A0 steering. A0 mode is
> not supported anymore. Printing a message and ignoring the parameter.
>
> CC: Carol Soto <clsoto@...ux.vnet.ibm.com>
> Signed-off-by: Amir Vadai <amirv@...lanox.com>
> ---
> drivers/net/ethernet/mellanox/mlx4/main.c | 8 ++++----
> include/linux/mlx4/device.h | 1 -
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
> index a56f601..08ff5dd 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
> @@ -132,8 +132,7 @@ MODULE_PARM_DESC(log_num_vlan, "Log2 max number of VLANs per ETH port (0-7)");
>
> static bool use_prio;
> module_param_named(use_prio, use_prio, bool, 0444);
Perhaps the sysfs permissions should be set to 0 (i.e. not visible in
sysfs)?
> -MODULE_PARM_DESC(use_prio, "Enable steering by VLAN priority on ETH ports "
> - "(0/1, default 0)");
> +MODULE_PARM_DESC(use_prio, "Enable steering by VLAN priority on ETH ports (deprecated)");
>
> int log_mtts_per_seg = ilog2(MLX4_MTT_ENTRY_PER_SEG);
> module_param_named(log_mtts_per_seg, log_mtts_per_seg, int, 0444);
> @@ -290,7 +289,6 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
>
> dev->caps.log_num_macs = log_num_mac;
> dev->caps.log_num_vlans = MLX4_LOG_NUM_VLANS;
> - dev->caps.log_num_prios = use_prio ? 3 : 0;
>
> for (i = 1; i <= dev->caps.num_ports; ++i) {
> dev->caps.port_type[i] = MLX4_PORT_TYPE_NONE;
> @@ -358,7 +356,6 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
> dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_ADDR] =
> (1 << dev->caps.log_num_macs) *
> (1 << dev->caps.log_num_vlans) *
> - (1 << dev->caps.log_num_prios) *
> dev->caps.num_ports;
> dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_EXCH] = MLX4_NUM_FEXCH;
>
> @@ -2775,6 +2772,9 @@ static int __init mlx4_verify_params(void)
> pr_warning("mlx4_core: log_num_vlan - obsolete module param, using %d\n",
> MLX4_LOG_NUM_VLANS);
>
> + if (use_prio != 0)
> + pr_warn("mlx4_core: use_prio - obsolete module param, ignored\n");
You spell it pr_warning() in the adjacent logging statements.
Ben.
> if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {
> pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);
> return -1;
> diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
> index c0468e6..ca38871 100644
> --- a/include/linux/mlx4/device.h
> +++ b/include/linux/mlx4/device.h
> @@ -449,7 +449,6 @@ struct mlx4_caps {
> int reserved_qps_base[MLX4_NUM_QP_REGION];
> int log_num_macs;
> int log_num_vlans;
> - int log_num_prios;
> enum mlx4_port_type port_type[MLX4_MAX_PORTS + 1];
> u8 supported_type[MLX4_MAX_PORTS + 1];
> u8 suggested_type[MLX4_MAX_PORTS + 1];
--
Ben Hutchings
Humans are not rational beings; they are rationalising beings.
Download attachment "signature.asc" of type "application/pgp-signature" (829 bytes)
Powered by blists - more mailing lists