aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/enic/enic_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/enic/enic_main.c')
-rw-r--r--drivers/net/enic/enic_main.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 89664c670972..37f907b32d68 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1381,9 +1381,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
1381 1381
1382 if (is_zero_ether_addr(netdev->dev_addr)) 1382 if (is_zero_ether_addr(netdev->dev_addr))
1383 random_ether_addr(netdev->dev_addr); 1383 random_ether_addr(netdev->dev_addr);
1384 } else if (new_pp.request == PORT_REQUEST_DISASSOCIATE) {
1385 if (!is_zero_ether_addr(enic->pp.mac_addr))
1386 enic_dev_del_addr(enic, enic->pp.mac_addr);
1387 } 1384 }
1388 1385
1389 memcpy(&enic->pp, &new_pp, sizeof(struct enic_port_profile)); 1386 memcpy(&enic->pp, &new_pp, sizeof(struct enic_port_profile));
@@ -1392,9 +1389,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
1392 if (err) 1389 if (err)
1393 goto set_port_profile_cleanup; 1390 goto set_port_profile_cleanup;
1394 1391
1395 if (!is_zero_ether_addr(enic->pp.mac_addr))
1396 enic_dev_add_addr(enic, enic->pp.mac_addr);
1397
1398set_port_profile_cleanup: 1392set_port_profile_cleanup:
1399 memset(enic->pp.vf_mac, 0, ETH_ALEN); 1393 memset(enic->pp.vf_mac, 0, ETH_ALEN);
1400 1394