UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

be2net: change to call pmac_del only if necessary 

If a mac address has not been configured for a VF,
there is no need to call be_cmd_pmac_del.

Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ajit Khaparde 2010-07-23 01:49:04 +00:00 committed by David S. Miller
parent 37773e8b2d
commit 9cd9000bde
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/benet/be.h
View File

@ -221,6 +221,7 @@ struct be_rx_obj {
};
#define BE_NUM_MSIX_VECTORS 2 /* 1 each for Tx and Rx */
#define BE_INVALID_PMAC_ID 0xffffffff
struct be_adapter {
struct pci_dev *pdev;
struct net_device *netdev;

6
drivers/net/benet/be_main.c
View File

@ -656,8 +656,9 @@ static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
if (!is_valid_ether_addr(mac) || (vf >= num_vfs))
return -EINVAL;
status = be_cmd_pmac_del(adapter, adapter->vf_if_handle[vf],
adapter->vf_pmac_id[vf]);
if (adapter->vf_pmac_id[vf] != BE_INVALID_PMAC_ID)
status = be_cmd_pmac_del(adapter, adapter->vf_if_handle[vf],
adapter->vf_pmac_id[vf]);
status = be_cmd_pmac_add(adapter, mac, adapter->vf_if_handle[vf],
&adapter->vf_pmac_id[vf]);
@ -1910,6 +1911,7 @@ static int be_setup(struct be_adapter *adapter)
"Interface Create failed for VF %d\n", vf);
goto if_destroy;
}
adapter->vf_pmac_id[vf] = BE_INVALID_PMAC_ID;
vf++;
}
} else if (!be_physfn(adapter)) {