diff options
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_sriov.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c index 221b2ca994e6..c4e5150a27eb 100644 --- a/drivers/net/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ixgbe/ixgbe_sriov.c | |||
| @@ -98,17 +98,6 @@ void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter) | |||
| 98 | 98 | ||
| 99 | int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf) | 99 | int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf) |
| 100 | { | 100 | { |
| 101 | u32 ctrl; | ||
| 102 | |||
| 103 | /* Check if global VLAN already set, if not set it */ | ||
| 104 | ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_VLNCTRL); | ||
| 105 | if (!(ctrl & IXGBE_VLNCTRL_VFE)) { | ||
| 106 | /* enable VLAN tag insert/strip */ | ||
| 107 | ctrl |= IXGBE_VLNCTRL_VFE; | ||
| 108 | ctrl &= ~IXGBE_VLNCTRL_CFIEN; | ||
| 109 | IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl); | ||
| 110 | } | ||
| 111 | |||
| 112 | return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add); | 101 | return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add); |
| 113 | } | 102 | } |
| 114 | 103 | ||
