1 files changed, 43 insertions, 1 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 5ac616093f9f..cb6339c35571 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -50,6 +50,7 @@ static inline void bnx2x_exe_queue_init(struct bnx2x *bp,
                                         int exe_len,
                                         union bnx2x_qable_obj *owner,
                                         exe_q_validate validate,
+                                        exe_q_remove remove,
                                         exe_q_optimize optimize,
                                         exe_q_execute exec,
                                         exe_q_get get)
@@ -66,6 +67,7 @@ static inline void bnx2x_exe_queue_init(struct bnx2x *bp,
 
         /* Owner specific callbacks */
         o->validate      = validate;
+        o->remove        = remove;
         o->optimize      = optimize;
         o->execute       = exec;
         o->get           = get;
@@ -1340,6 +1342,35 @@ static int bnx2x_validate_vlan_mac(struct bnx2x *bp,
         }
 }
 
+static int bnx2x_remove_vlan_mac(struct bnx2x *bp,
+                                  union bnx2x_qable_obj *qo,
+                                  struct bnx2x_exeq_elem *elem)
+{
+        int rc = 0;
+
+        /* If consumption wasn't required, nothing to do */
+        if (test_bit(BNX2X_DONT_CONSUME_CAM_CREDIT,
+                     &elem->cmd_data.vlan_mac.vlan_mac_flags))
+                return 0;
+
+        switch (elem->cmd_data.vlan_mac.cmd) {
+        case BNX2X_VLAN_MAC_ADD:
+        case BNX2X_VLAN_MAC_MOVE:
+                rc = qo->vlan_mac.put_credit(&qo->vlan_mac);
+                break;
+        case BNX2X_VLAN_MAC_DEL:
+                rc = qo->vlan_mac.get_credit(&qo->vlan_mac);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (rc != true)
+                return -EINVAL;
+
+        return 0;
+}
+
 /**
  * bnx2x_wait_vlan_mac - passivly wait for 5 seconds until all work completes.
  *
@@ -1801,8 +1832,14 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,
 
         list_for_each_entry_safe(exeq_pos, exeq_pos_n, &exeq->exe_queue, link) {
                 if (exeq_pos->cmd_data.vlan_mac.vlan_mac_flags ==
-                    *vlan_mac_flags)
+                    *vlan_mac_flags) {
+                        rc = exeq->remove(bp, exeq->owner, exeq_pos);
+                        if (rc) {
+                                BNX2X_ERR("Failed to remove command\n");
+                                return rc;
+                        }
                         list_del(&exeq_pos->link);
+                }
         }
 
         spin_unlock_bh(&exeq->lock);
@@ -1908,6 +1945,7 @@ void bnx2x_init_mac_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &mac_obj->exe_queue, 1, qable_obj,
                                      bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_mac);
@@ -1924,6 +1962,7 @@ void bnx2x_init_mac_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &mac_obj->exe_queue, CLASSIFY_RULES_COUNT,
                                      qable_obj, bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_mac);
@@ -1963,6 +2002,7 @@ void bnx2x_init_vlan_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &vlan_obj->exe_queue, CLASSIFY_RULES_COUNT,
                                      qable_obj, bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_vlan);
@@ -2009,6 +2049,7 @@ void bnx2x_init_vlan_mac_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &vlan_mac_obj->exe_queue, 1, qable_obj,
                                      bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_vlan_mac);
@@ -2025,6 +2066,7 @@ void bnx2x_init_vlan_mac_obj(struct bnx2x *bp,
                                      &vlan_mac_obj->exe_queue,
                                      CLASSIFY_RULES_COUNT,
                                      qable_obj, bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_vlan_mac);