diff options
author | Carolyn Wyborny <carolyn.wyborny@intel.com> | 2014-04-10 21:45:23 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-23 04:30:15 -0400 |
commit | d34a15abfe370252de83e14e763cf7fcb8c84585 (patch) | |
tree | 65c391f00fff7be098d9344522c72d6f599808bf /drivers/net/ethernet/intel/igb/igb_main.c | |
parent | c75c4edfc38da8235d110a8f28b596193de787ab (diff) |
igb: Cleanups to fix braces location warnings
This patch fixes WARNING:BRACES and ERROR:OPEN_BRACE from
checkpatch file check.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 13edca95e56d..e6e4f4ba0b78 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -4235,9 +4235,8 @@ static void igb_watchdog_task(struct work_struct *work) | |||
4235 | 4235 | ||
4236 | /* check for thermal sensor event */ | 4236 | /* check for thermal sensor event */ |
4237 | if (igb_thermal_sensor_event(hw, | 4237 | if (igb_thermal_sensor_event(hw, |
4238 | E1000_THSTAT_LINK_THROTTLE)) { | 4238 | E1000_THSTAT_LINK_THROTTLE)) |
4239 | netdev_info(netdev, "The network adapter link speed was downshifted because it overheated\n"); | 4239 | netdev_info(netdev, "The network adapter link speed was downshifted because it overheated\n"); |
4240 | } | ||
4241 | 4240 | ||
4242 | /* adjust timeout factor according to speed/duplex */ | 4241 | /* adjust timeout factor according to speed/duplex */ |
4243 | adapter->tx_timeout_factor = 1; | 4242 | adapter->tx_timeout_factor = 1; |
@@ -4473,13 +4472,12 @@ static void igb_update_itr(struct igb_q_vector *q_vector, | |||
4473 | case low_latency: /* 50 usec aka 20000 ints/s */ | 4472 | case low_latency: /* 50 usec aka 20000 ints/s */ |
4474 | if (bytes > 10000) { | 4473 | if (bytes > 10000) { |
4475 | /* this if handles the TSO accounting */ | 4474 | /* this if handles the TSO accounting */ |
4476 | if (bytes/packets > 8000) { | 4475 | if (bytes/packets > 8000) |
4477 | itrval = bulk_latency; | 4476 | itrval = bulk_latency; |
4478 | } else if ((packets < 10) || ((bytes/packets) > 1200)) { | 4477 | else if ((packets < 10) || ((bytes/packets) > 1200)) |
4479 | itrval = bulk_latency; | 4478 | itrval = bulk_latency; |
4480 | } else if ((packets > 35)) { | 4479 | else if ((packets > 35)) |
4481 | itrval = lowest_latency; | 4480 | itrval = lowest_latency; |
4482 | } | ||
4483 | } else if (bytes/packets > 2000) { | 4481 | } else if (bytes/packets > 2000) { |
4484 | itrval = bulk_latency; | 4482 | itrval = bulk_latency; |
4485 | } else if (packets <= 2 && bytes < 512) { | 4483 | } else if (packets <= 2 && bytes < 512) { |