diff options
| author | David S. Miller | 2016-04-27 21:43:10 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-04-27 21:43:10 +0200 |
| commit | c0cc53162a0644dd57dce5e2fbb9bbafdc57d183 (patch) | |
| tree | 02393c85628c6ec7d0d942e880623b7f37cf3460 /include/linux/mlx5/port.h | |
| parent | net: ipv6: Use passed in table for nexthop lookups (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.tar.gz kernel-qcow2-linux-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.tar.xz kernel-qcow2-linux-c0cc53162a0644dd57dce5e2fbb9bbafdc57d183.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts.
In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx5/port.h')
| -rw-r--r-- | include/linux/mlx5/port.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mlx5/port.h b/include/linux/mlx5/port.h index 7391eb833253..9851862c0ec5 100644 --- a/include/linux/mlx5/port.h +++ b/include/linux/mlx5/port.h @@ -73,9 +73,9 @@ int mlx5_query_port_admin_status(struct mlx5_core_dev *dev, enum mlx5_port_status *status); int mlx5_set_port_beacon(struct mlx5_core_dev *dev, u16 beacon_duration); -int mlx5_set_port_mtu(struct mlx5_core_dev *dev, int mtu, u8 port); -void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, int *max_mtu, u8 port); -void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, int *oper_mtu, +int mlx5_set_port_mtu(struct mlx5_core_dev *dev, u16 mtu, u8 port); +void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, u16 *max_mtu, u8 port); +void mlx5_query_port_oper_mtu(struct mlx5_core_dev *dev, u16 *oper_mtu, u8 port); int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev, |