mlx4_core: Read extended capabilities into the flags field

Query another dword containing up to 32 extended device capabilities
and merge it into struct mlx4_caps.flags.  Update the code that
handles the current extended device capabilities (e.g UDP RSS, WoL,
vep steering, etc) to use the extended device cap flags field instead
of a field per extended capability.  Initial patch done by Eli Cohen
<eli@mellanox.co.il>.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index 8856659fb43c..1f95afda6841 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -146,7 +146,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
         int i, err = 0;
         int free = -1;
 
-        if (dev->caps.vep_uc_steering) {
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 err = mlx4_uc_steer_add(dev, port, mac, qpn, 1);
                 if (!err) {
                         entry = kmalloc(sizeof *entry, GFP_KERNEL);
@@ -203,7 +203,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
                 goto out;
         }
 
-        if (!dev->caps.vep_uc_steering)
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
                 *qpn = info->base_qpn + free;
         ++table->total;
 out:
@@ -243,7 +243,7 @@ void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int qpn)
         int index = qpn - info->base_qpn;
         struct mlx4_mac_entry *entry;
 
-        if (dev->caps.vep_uc_steering) {
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 entry = radix_tree_lookup(&info->mac_tree, qpn);
                 if (entry) {
                         mlx4_uc_steer_release(dev, port, entry->mac, qpn, 1);
@@ -274,7 +274,7 @@ int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac, u8 wra
         struct mlx4_mac_entry *entry;
         int err;
 
-        if (dev->caps.vep_uc_steering) {
+        if (dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER) {
                 entry = radix_tree_lookup(&info->mac_tree, qpn);
                 if (!entry)
                         return -EINVAL;