diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2012-12-05 06:26:56 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-01-16 01:00:09 -0800 |
| commit | d60923c465809cec44fb08c53da6cf0c53040dc1 (patch) | |
| tree | b81aac60048c5dc8c7f785c31a69ceee4b444dc5 | |
| parent | e3d14b08e80744958af920ab8bc8ee3866c3902b (diff) | |
| download | linux-exynos-d60923c465809cec44fb08c53da6cf0c53040dc1.tar.gz linux-exynos-d60923c465809cec44fb08c53da6cf0c53040dc1.tar.bz2 linux-exynos-d60923c465809cec44fb08c53da6cf0c53040dc1.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 6aa9c5d31a48..05538e66c809 100644 --- 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; |