lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000e: merge multiple conditional statements into one

Browse Source 
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>
This commit is contained in:
Bruce Allan
2012-12-05 06:26:56 +00:00
committed by Jeff Kirsher
parent e3d14b08e8
commit d60923c465
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/intel/e1000e/netdev.c
View File

@@ -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;