From bbab5ca6f62b38744e218cc4ac84431164c387df Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 23 Jul 2010 01:49:04 +0000 Subject: [PATCH] --- yaml --- r: 203682 b: refs/heads/master c: 9cd9000bdee9131ffd2ce92ca6ef9c86467edd25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be.h | 1 + trunk/drivers/net/benet/be_main.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f41b1077bfbf..962d4a149474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37773e8b2da813045d79b38e973cb07b5df788dd +refs/heads/master: 9cd9000bdee9131ffd2ce92ca6ef9c86467edd25 diff --git a/trunk/drivers/net/benet/be.h b/trunk/drivers/net/benet/be.h index f17428caecf1..c730bd64628a 100644 --- a/trunk/drivers/net/benet/be.h +++ b/trunk/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/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index e6ca92334d6d..899881b5aab9 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/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)) {