Commit 9cd9000b authored Jul 23, 2010 by Ajit Khaparde Committed by David S. Miller Jul 23, 2010

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>

parent 37773e8b

drivers/net/benet/be.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/benet/be_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -656,6 +656,7 @@ 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;

		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]);

		@@ -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)) {