diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-29 22:17:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-29 22:17:42 +0300 |
| commit | e400b7977e7c014bc0c298b2d834311770a777ac (patch) | |
| tree | 84bdd8093c8df46f66d88836732580e2d3e63acb /include/linux | |
| parent | f0c16ba8933ed217c2688b277410b2a37ba81591 (diff) | |
| parent | 10b1c04e92229ebeb38ccd0dcf2b6d3ec73c0575 (diff) | |
| download | linux-e400b7977e7c014bc0c298b2d834311770a777ac.tar.xz | |
Merge branch 'mlx4-misc-fixes'
Tariq Toukan says:
====================
mlx4 misc fixes
This patchset contains several bug fixes from the team to the
mlx4 Eth and Core drivers.
Series generated against net commit:
60133867f1f1 'net: wan: slic_ds26522: fix spelling mistake: "configurated" -> "configured"'
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 93bdb3485192..6533c16e27ad 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -1384,6 +1384,8 @@ int set_phv_bit(struct mlx4_dev *dev, u8 port, int new_val); int get_phv_bit(struct mlx4_dev *dev, u8 port, int *phv); int mlx4_get_is_vlan_offload_disabled(struct mlx4_dev *dev, u8 port, bool *vlan_offload_disabled); +void mlx4_handle_eth_header_mcast_prio(struct mlx4_net_trans_rule_hw_ctrl *ctrl, + struct _rule_hw *eth_header); int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx); int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx); int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index); |