e1000e: merge multiple conditional statements into one

Cleanup a set of conditional tests.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 6aa9c5d31a48d925f8487a92ff9f97a397d99142..05538e66c809a53fe94f3c452262efe86b1e00a4 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4914,12 +4914,11 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
        struct e1000_hw *hw =  &adapter->hw;
        u16 length, offset;
 
-       if (vlan_tx_tag_present(skb)) {
-               if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
-                   (adapter->hw.mng_cookie.status &
-                       E1000_MNG_DHCP_COOKIE_STATUS_VLAN)))
-                       return 0;
-       }
+       if (vlan_tx_tag_present(skb) &&
+           !((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
+             (adapter->hw.mng_cookie.status &
+              E1000_MNG_DHCP_COOKIE_STATUS_VLAN)))
+               return 0;
 
        if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
                return 0;