diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2018-04-25 11:31:13 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-25 14:11:27 -0400 |
| commit | 4d7b44833e9a129d3220152727a19cceea3a2ac4 (patch) | |
| tree | eba0269006e7403c228bfa29c9a9e869a8e19ddc /drivers/net/ethernet/amd/amd8111e.c | |
| parent | sctp: remove the unused sctp_assoc_is_match function (diff) | |
| download | linux-dev-4d7b44833e9a129d3220152727a19cceea3a2ac4.tar.xz linux-dev-4d7b44833e9a129d3220152727a19cceea3a2ac4.zip | |
net: amd8111e: remove redundant duplicated if statement
There are two identical nested if statements, the second is redundant
and can be removed. Also clean up white space formatting.
Cleans up cppcheck warning:
drivers/net/ethernet/amd/amd8111e.c:1080: (warning) Identical inner 'if'
condition is always true.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/amd8111e.c')
| -rw-r--r-- | drivers/net/ethernet/amd/amd8111e.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index c99e3e845ac0..a90080f12e67 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -1074,16 +1074,12 @@ static int amd8111e_calc_coalesce(struct net_device *dev) amd8111e_set_coalesce(dev,TX_INTR_COAL); coal_conf->tx_coal_type = MEDIUM_COALESCE; } - - } - else if(tx_pkt_size >= 1024){ - if (tx_pkt_size >= 1024){ - if(coal_conf->tx_coal_type != HIGH_COALESCE){ - coal_conf->tx_timeout = 4; - coal_conf->tx_event_count = 8; - amd8111e_set_coalesce(dev,TX_INTR_COAL); - coal_conf->tx_coal_type = HIGH_COALESCE; - } + } else if (tx_pkt_size >= 1024) { + if (coal_conf->tx_coal_type != HIGH_COALESCE) { + coal_conf->tx_timeout = 4; + coal_conf->tx_event_count = 8; + amd8111e_set_coalesce(dev, TX_INTR_COAL); + coal_conf->tx_coal_type = HIGH_COALESCE; } } } |