be2net: use be_virtfn() instead of !be_physfn() (18c57c74) · Commits · 戴 / test

drivers/net/ethernet/emulex/benet/be_cmds.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1458,7 +1458,7 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
		*if_handle = le32_to_cpu(resp->interface_id);

		/* Hack to retrieve VF's pmac-id on BE3 */
		if (BE3_chip(adapter) && !be_physfn(adapter))
		if (BE3_chip(adapter) && be_virtfn(adapter))
		adapter->pmac_id[0] = le32_to_cpu(resp->pmac_id);
		}
		return status;
		@@ -3271,7 +3271,7 @@ static bool be_is_wol_excluded(struct be_adapter *adapter)
		{
		struct pci_dev *pdev = adapter->pdev;

		if (!be_physfn(adapter))
		if (be_virtfn(adapter))
		return true;

		switch (pdev->subsystem_device) {

+6 −5

Original line number	Diff line number	Diff line
		@@ -3112,7 +3112,7 @@ fail:
		dev_warn(dev, "MSIx enable failed\n");

		/* INTx is not supported in VFs, so fail probe if enable_msix fails */
		if (!be_physfn(adapter))
		if (be_virtfn(adapter))
		return num_vec;
		return 0;
		}
		@@ -3159,7 +3159,7 @@ static int be_irq_register(struct be_adapter *adapter)
		if (status == 0)
		goto done;
		/* INTx is not supported for VF */
		if (!be_physfn(adapter))
		if (be_virtfn(adapter))
		return status;
		}

		@@ -3840,7 +3840,8 @@ static void BEx_get_resources(struct be_adapter *adapter,
		* only if it is RSS-capable.
		*/
		if (BE2_chip(adapter) \|\| use_sriov \|\| (adapter->port_num > 1) \|\|
		!be_physfn(adapter) \|\| (be_is_mc(adapter) &&
		be_virtfn(adapter) \|\|
		(be_is_mc(adapter) &&
		!(adapter->function_caps & BE_FUNCTION_CAPS_RSS))) {
		res->max_tx_qs = 1;
		} else if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) {
		@@ -5289,7 +5290,7 @@ static void be_unmap_pci_bars(struct be_adapter *adapter)

		static int db_bar(struct be_adapter *adapter)
		{
		if (lancer_chip(adapter) \|\| !be_physfn(adapter))
		if (lancer_chip(adapter) \|\| be_virtfn(adapter))
		return 0;
		else
		return 4;