diff options
author | David S. Miller | 2014-09-08 06:41:53 +0200 |
---|---|---|
committer | David S. Miller | 2014-09-08 06:41:53 +0200 |
commit | eb84d6b60491a3ca3d90d62ee5346b007770d40d (patch) | |
tree | 22aadf9ada15e1ae5ba4c400aafab6f2541996e6 /include/linux/mlx4 | |
parent | net: phy: mdio-sun4i: don't select REGULATOR (diff) | |
parent | Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | kernel-qcow2-linux-eb84d6b60491a3ca3d90d62ee5346b007770d40d.tar.gz kernel-qcow2-linux-eb84d6b60491a3ca3d90d62ee5346b007770d40d.tar.xz kernel-qcow2-linux-eb84d6b60491a3ca3d90d62ee5346b007770d40d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/linux/mlx4')
-rw-r--r-- | include/linux/mlx4/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 783dd099abd1..1befd8df9cfc 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -1197,6 +1197,9 @@ int mlx4_map_sw_to_hw_steering_id(struct mlx4_dev *dev, enum mlx4_net_trans_rule_id id); int mlx4_hw_rule_sz(struct mlx4_dev *dev, enum mlx4_net_trans_rule_id id); +int mlx4_tunnel_steer_add(struct mlx4_dev *dev, unsigned char *addr, + int port, int qpn, u16 prio, u64 *reg_id); + void mlx4_sync_pkey_table(struct mlx4_dev *dev, int slave, int port, int i, int val); |