svn commit: r293156 - stable/10/sys/dev/mlx5/mlx5_en
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Jan 4 09:55:22 UTC 2016
Author: hselasky
Date: Mon Jan 4 09:55:21 2016
New Revision: 293156
URL: https://svnweb.freebsd.org/changeset/base/293156
Log:
MFC r292946:
10G ER/LR should present itself as LR.
MFC after: 1 week
Submitted by: Shahar Klein <shahark at mellanox.com>
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/dev/mlx5/mlx5_en/en.h
stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/en.h Mon Jan 4 09:52:40 2016 (r293155)
+++ stable/10/sys/dev/mlx5/mlx5_en/en.h Mon Jan 4 09:55:21 2016 (r293156)
@@ -700,7 +700,7 @@ enum mlx5e_link_mode {
MLX5E_56GBASE_R4 = 8,
MLX5E_10GBASE_CR = 12,
MLX5E_10GBASE_SR = 13,
- MLX5E_10GBASE_ER = 14,
+ MLX5E_10GBASE_LR = 14,
MLX5E_40GBASE_SR4 = 15,
MLX5E_40GBASE_LR4 = 16,
MLX5E_100GBASE_CR4 = 20,
Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jan 4 09:52:40 2016 (r293155)
+++ stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Jan 4 09:55:21 2016 (r293156)
@@ -106,8 +106,8 @@ static const struct {
.subtype = IFM_10G_SR,
.baudrate = IF_Gbps(10ULL),
},
- [MLX5E_10GBASE_ER] = {
- .subtype = IFM_10G_ER,
+ [MLX5E_10GBASE_LR] = {
+ .subtype = IFM_10G_LR,
.baudrate = IF_Gbps(10ULL),
},
[MLX5E_40GBASE_SR4] = {
More information about the svn-src-stable-10
mailing list