diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-08 16:15:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-08 16:15:29 -0700 |
| commit | 81d1a366ff814211f3169e6b3e2c9eea682a679e (patch) | |
| tree | 78a463ca47e06f2b59dad504f05904f1ee0e5f85 /include/linux | |
| parent | 76061f631c2ea4ab9c4d66f3a96ecc5737f5aaf7 (diff) | |
| parent | cd17d230dd060a12f7451c0caeedb3fd5158eaf9 (diff) | |
| download | cachepc-linux-81d1a366ff814211f3169e6b3e2c9eea682a679e.tar.gz cachepc-linux-81d1a366ff814211f3169e6b3e2c9eea682a679e.zip | |
Merge branch 'mlx5-fixes'
Saeed Mahameed says:
====================
Mellanox 100G mlx5 fixes 2016-09-07
The following series contains bug fixes for the mlx5e driver.
from Gal,
- Static code checker cleanup (casting overflow)
- Fix global PFC counter statistics reading
- Fix HW LRO when vlan stripping is off
From Bodong,
- Deprecate old autoneg capability bit and use new one.
From Tariq,
- Fix xmit more counter race condition
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx5/mlx5_ifc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 21bc4557b67a..d1f9a581aca8 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -6710,9 +6710,10 @@ struct mlx5_ifc_pude_reg_bits { }; struct mlx5_ifc_ptys_reg_bits { - u8 an_disable_cap[0x1]; + u8 reserved_at_0[0x1]; u8 an_disable_admin[0x1]; - u8 reserved_at_2[0x6]; + u8 an_disable_cap[0x1]; + u8 reserved_at_3[0x5]; u8 local_port[0x8]; u8 reserved_at_10[0xd]; u8 proto_mask[0x3]; |