diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/cmd.h | 7 | ||||
| -rw-r--r-- | include/linux/mlx4/device.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h index 79a347238168..009985628257 100644 --- a/include/linux/mlx4/cmd.h +++ b/include/linux/mlx4/cmd.h | |||
| @@ -240,6 +240,13 @@ int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos); | |||
| 240 | int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting); | 240 | int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting); |
| 241 | int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_info *ivf); | 241 | int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_info *ivf); |
| 242 | int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state); | 242 | int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state); |
| 243 | /* | ||
| 244 | * mlx4_get_slave_default_vlan - | ||
| 245 | * return true if VST ( default vlan) | ||
| 246 | * if VST, will return vlan & qos (if not NULL) | ||
| 247 | */ | ||
| 248 | bool mlx4_get_slave_default_vlan(struct mlx4_dev *dev, int port, int slave, | ||
| 249 | u16 *vlan, u8 *qos); | ||
| 243 | 250 | ||
| 244 | #define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8) | 251 | #define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8) |
| 245 | 252 | ||
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 86e02e5c2c77..f211b51dc726 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
| @@ -632,7 +632,8 @@ struct mlx4_eth_av { | |||
| 632 | u8 hop_limit; | 632 | u8 hop_limit; |
| 633 | __be32 sl_tclass_flowlabel; | 633 | __be32 sl_tclass_flowlabel; |
| 634 | u8 dgid[16]; | 634 | u8 dgid[16]; |
| 635 | u32 reserved4[2]; | 635 | u8 s_mac[6]; |
| 636 | u8 reserved4[2]; | ||
| 636 | __be16 vlan; | 637 | __be16 vlan; |
| 637 | u8 mac[ETH_ALEN]; | 638 | u8 mac[ETH_ALEN]; |
| 638 | }; | 639 | }; |
