diff options
| author |   Ajit Khaparde <ajitk@serverengines.com> | 2010-07-23 01:49:04 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-07-23 12:40:52 -0700 |
| commit | 9cd9000bdee9131ffd2ce92ca6ef9c86467edd25 (patch) | |
| tree | c021e89e872654bc481e52fee9314d3f08b1e548 | |
| parent | qeth: avoid useless removal of multicast addresses (diff) | |
| download | linux-dev-9cd9000bdee9131ffd2ce92ca6ef9c86467edd25.tar.xz linux-dev-9cd9000bdee9131ffd2ce92ca6ef9c86467edd25.zip | |
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>
| -rw-r--r-- | drivers/net/benet/be.h | 1 | ||||
| -rw-r--r-- | drivers/net/benet/be_main.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index f17428caecf1..c730bd64628a 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -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; diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index e6ca92334d6d..899881b5aab9 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -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)) { |