Commit d60923c4 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher

e1000e: merge multiple conditional statements into one

Cleanup a set of conditional tests.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e3d14b08
...@@ -4914,12 +4914,11 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter, ...@@ -4914,12 +4914,11 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
u16 length, offset; u16 length, offset;
if (vlan_tx_tag_present(skb)) { if (vlan_tx_tag_present(skb) &&
if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) && !((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) &&
(adapter->hw.mng_cookie.status & (adapter->hw.mng_cookie.status &
E1000_MNG_DHCP_COOKIE_STATUS_VLAN))) E1000_MNG_DHCP_COOKIE_STATUS_VLAN)))
return 0; return 0;
}
if (skb->len <= MINIMUM_DHCP_PACKET_SIZE) if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment