Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b509c0c authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: cleanup ixgbe_ndo_set_vf_vlan 



Clean up functionality in ixgbe_ndo_set_vf_vlan that will simplify later
patches.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 71bde601

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

+61 −33
Original line number Diff line number Diff line
@@ -1079,22 +1079,16 @@ int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) 
	return ixgbe_set_vf_mac(adapter, vf, mac);

}



int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)

static int ixgbe_enable_port_vlan(struct ixgbe_adapter *adapter, int vf,

				  u16 vlan, u8 qos)

{

	int err = 0;

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	int err = 0;



	if ((vf >= adapter->num_vfs) || (vlan > 4095) || (qos > 7))

		return -EINVAL;

	if (vlan || qos) {

	if (adapter->vfinfo[vf].pf_vlan)

		err = ixgbe_set_vf_vlan(adapter, false,

					adapter->vfinfo[vf].pf_vlan,

					vf);

		if (err)

			goto out;

		err = ixgbe_set_vf_vlan(adapter, true, vlan, vf);

	if (err)

		goto out;

	ixgbe_set_vmvir(adapter, vlan, qos, vf);
@@ -1108,13 +1102,20 @@ int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) 
		 "Setting VLAN %d, QOS 0x%x on VF %d\n", vlan, qos, vf);

	if (test_bit(__IXGBE_DOWN, &adapter->state)) {

		dev_warn(&adapter->pdev->dev,

				 "The VF VLAN has been set,"

				 " but the PF device is not up.\n");

			 "The VF VLAN has been set, but the PF device is not up.\n");

		dev_warn(&adapter->pdev->dev,

				 "Bring the PF device up before"

				 " attempting to use the VF device.\n");

			 "Bring the PF device up before attempting to use the VF device.\n");

	}

	} else {



out:

	return err;

}



static int ixgbe_disable_port_vlan(struct ixgbe_adapter *adapter, int vf)

{

	struct ixgbe_hw *hw = &adapter->hw;

	int err;



	err = ixgbe_set_vf_vlan(adapter, false,

				adapter->vfinfo[vf].pf_vlan, vf);

	ixgbe_clear_vmvir(adapter, vf);
@@ -1124,7 +1125,34 @@ int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) 
		adapter->vfinfo[vf].vlan_count--;

	adapter->vfinfo[vf].pf_vlan = 0;

	adapter->vfinfo[vf].pf_qos = 0;



	return err;

}



int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)

{

	int err = 0;

	struct ixgbe_adapter *adapter = netdev_priv(netdev);



	if ((vf >= adapter->num_vfs) || (vlan > 4095) || (qos > 7))

		return -EINVAL;

	if (vlan || qos) {

		/* Check if there is already a port VLAN set, if so

		 * we have to delete the old one first before we

		 * can set the new one.  The usage model had

		 * previously assumed the user would delete the

		 * old port VLAN before setting a new one but this

		 * is not necessarily the case.

		 */

		if (adapter->vfinfo[vf].pf_vlan)

			err = ixgbe_disable_port_vlan(adapter, vf);

		if (err)

			goto out;

		err = ixgbe_enable_port_vlan(adapter, vf, vlan, qos);

	} else {

		err = ixgbe_disable_port_vlan(adapter, vf);

	}



out:

	return err;

}