diff --git a/[refs] b/[refs]
index 8480900c415b..dbad386d5b54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c70a3a9203ba327b86a4ce895c04e6d4ef18ee57
+refs/heads/master: 20e72a44098641f0c4de34a31287a93e006afb5b
diff --git a/trunk/drivers/net/mlx4/port.c b/trunk/drivers/net/mlx4/port.c
index 1f95afda6841..609e0ec14cee 100644
--- a/trunk/drivers/net/mlx4/port.c
+++ b/trunk/drivers/net/mlx4/port.c
@@ -258,9 +258,12 @@ void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int qpn)
 	if (validate_index(dev, table, index))
 		goto out;
 
-	table->entries[index] = 0;
-	mlx4_set_port_mac_table(dev, port, table->entries);
-	--table->total;
+	/* Check whether this address has reference count */
+	if (!(--table->refs[index])) {
+		table->entries[index] = 0;
+		mlx4_set_port_mac_table(dev, port, table->entries);
+		--table->total;
+	}
 out:
 	mutex_unlock(&table->mutex);
 }