diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-08-02 10:44:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-02 10:44:10 -0700 |
| commit | db803a46ae33b9dadc064240b700f610c89549ee (patch) | |
| tree | 803a01550ec23d3826adf3d20d1d911df5f3a4ba /include/linux | |
| parent | Merge branch 'lan78xx-Fixes' (diff) | |
| parent | net/mlx4_core: Fixes missing capability bit in flags2 capability dump (diff) | |
Merge branch 'mlx4-misc-fixes'
Tariq Toukan says:
====================
mlx4 misc fixes
This patchset contains misc bug fixes from the team
to the mlx4 Core and Eth drivers.
Patch 1 by Inbar fixes a wrong ethtool indication for Wake-on-LAN.
The other 3 patches by Jack add a missing capability description,
and fixes the off-by-1 misalignment for the following capabilities
descriptions.
Series generated against net commit:
cc75f8514db6 samples/bpf: fix bpf tunnel cleanup
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index aad5d81dfb44..b54517c05e9a 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -620,6 +620,7 @@ struct mlx4_caps { u32 dmfs_high_rate_qpn_base; u32 dmfs_high_rate_qpn_range; u32 vf_caps; + bool wol_port[MLX4_MAX_PORTS + 1]; struct mlx4_rate_limit_caps rl_caps; }; |