1 files changed, 13 insertions, 5 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 8b08b20e8b30..d4481454b5f8 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -483,11 +483,17 @@ static void qlcnic_add_vxlan_port(struct net_device *netdev,
         /* Adapter supports only one VXLAN port. Use very first port
          * for enabling offload
          */
-        if (!qlcnic_encap_rx_offload(adapter) || ahw->vxlan_port)
+        if (!qlcnic_encap_rx_offload(adapter))
                 return;
+        if (!ahw->vxlan_port_count) {
+                ahw->vxlan_port_count = 1;
+                ahw->vxlan_port = ntohs(port);
+                adapter->flags |= QLCNIC_ADD_VXLAN_PORT;
+                return;
+        }
+        if (ahw->vxlan_port == ntohs(port))
+                ahw->vxlan_port_count++;
 
-        ahw->vxlan_port = ntohs(port);
-        adapter->flags |= QLCNIC_ADD_VXLAN_PORT;
 }
 
 static void qlcnic_del_vxlan_port(struct net_device *netdev,
@@ -496,11 +502,13 @@ static void qlcnic_del_vxlan_port(struct net_device *netdev,
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
-        if (!qlcnic_encap_rx_offload(adapter) || !ahw->vxlan_port ||
+        if (!qlcnic_encap_rx_offload(adapter) || !ahw->vxlan_port_count ||
             (ahw->vxlan_port != ntohs(port)))
                 return;
 
-        adapter->flags |= QLCNIC_DEL_VXLAN_PORT;
+        ahw->vxlan_port_count--;
+        if (!ahw->vxlan_port_count)
+                adapter->flags |= QLCNIC_DEL_VXLAN_PORT;
 }
 
 static netdev_features_t qlcnic_features_check(struct sk_buff *skb,