diff options
author | Yan Burman <yanb@mellanox.com> | 2013-02-06 21:25:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-07 23:26:12 -0500 |
commit | 16a10ffd20a13215243bdba64c8e57ef277a55b9 (patch) | |
tree | 3454a2b1371b65db0134cc73c5ed920ab5bc5afb /drivers/net/ethernet/mellanox/mlx4/mlx4.h | |
parent | 48e551ff3da5084371bbca93380368ee18050c9e (diff) |
net/mlx4: Move Ethernet related functionality from mlx4_core to mlx4_en
Move low level code that deals with management of Ethernet MACs and QPs from mlx4_core to mlx4_en.
Also convert the new functions to deal with MACs in form of char array instead of u64.
Actual functions moved:
mlx4_replace_mac
mlx4_get_eth_qp
mlx4_put_eth_qp
To conduct this change, some functionality had to be exported from the core,
the following functions were added:
mlx4_get_base_qp
__mlx4_replace_mac (low level function for CX1/A0 compatibility)
Signed-off-by: Yan Burman <yanb@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4.h')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index 172daaa29a9e..ed4a6959e828 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h | |||
@@ -653,11 +653,6 @@ struct mlx4_set_port_rqp_calc_context { | |||
653 | __be32 mcast; | 653 | __be32 mcast; |
654 | }; | 654 | }; |
655 | 655 | ||
656 | struct mlx4_mac_entry { | ||
657 | u64 mac; | ||
658 | u64 reg_id; | ||
659 | }; | ||
660 | |||
661 | struct mlx4_port_info { | 656 | struct mlx4_port_info { |
662 | struct mlx4_dev *dev; | 657 | struct mlx4_dev *dev; |
663 | int port; | 658 | int port; |
@@ -667,7 +662,6 @@ struct mlx4_port_info { | |||
667 | char dev_mtu_name[16]; | 662 | char dev_mtu_name[16]; |
668 | struct device_attribute port_mtu_attr; | 663 | struct device_attribute port_mtu_attr; |
669 | struct mlx4_mac_table mac_table; | 664 | struct mlx4_mac_table mac_table; |
670 | struct radix_tree_root mac_tree; | ||
671 | struct mlx4_vlan_table vlan_table; | 665 | struct mlx4_vlan_table vlan_table; |
672 | int base_qpn; | 666 | int base_qpn; |
673 | }; | 667 | }; |
@@ -916,7 +910,6 @@ int __mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align, | |||
916 | void __mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt); | 910 | void __mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt); |
917 | int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac); | 911 | int __mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac); |
918 | void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac); | 912 | void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac); |
919 | int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac); | ||
920 | int __mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt, | 913 | int __mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt, |
921 | int start_index, int npages, u64 *page_list); | 914 | int start_index, int npages, u64 *page_list); |
922 | int __mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx); | 915 | int __mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx); |