aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x/bnx2x_ethtool.c
diff options
context:
space:
mode:
authorDmitry Kravkov <dmitry@broadcom.com>2010-10-05 23:34:21 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-06 17:10:41 -0400
commitf85582f8c48addd8166727ef692d88b0ff618c5e (patch)
tree5ea8ef71ae9ca5e67793350b3533f146116bd177 /drivers/net/bnx2x/bnx2x_ethtool.c
parentc2bff63fad94eeecf59e4ba8e4cb51688ccae1ec (diff)
bnx2x: code beautify
This patch does not include any functional changes. The changes are: empty lines, indentation and comments. Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_ethtool.c')
-rw-r--r--drivers/net/bnx2x/bnx2x_ethtool.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 8fb00276dc41..54fe0615a8b9 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -25,7 +25,6 @@
25#include "bnx2x_cmn.h" 25#include "bnx2x_cmn.h"
26#include "bnx2x_dump.h" 26#include "bnx2x_dump.h"
27 27
28
29static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 28static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
30{ 29{
31 struct bnx2x *bp = netdev_priv(dev); 30 struct bnx2x *bp = netdev_priv(dev);
@@ -963,6 +962,7 @@ static int bnx2x_set_eeprom(struct net_device *dev,
963 962
964 return rc; 963 return rc;
965} 964}
965
966static int bnx2x_get_coalesce(struct net_device *dev, 966static int bnx2x_get_coalesce(struct net_device *dev,
967 struct ethtool_coalesce *coal) 967 struct ethtool_coalesce *coal)
968{ 968{
@@ -1288,6 +1288,7 @@ static int bnx2x_test_registers(struct bnx2x *bp)
1288 save_val = REG_RD(bp, offset); 1288 save_val = REG_RD(bp, offset);
1289 1289
1290 REG_WR(bp, offset, (wr_val & mask)); 1290 REG_WR(bp, offset, (wr_val & mask));
1291
1291 val = REG_RD(bp, offset); 1292 val = REG_RD(bp, offset);
1292 1293
1293 /* Restore the original register's value */ 1294 /* Restore the original register's value */
@@ -1471,6 +1472,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
1471 1472
1472 /* turn on parsing and get a BD */ 1473 /* turn on parsing and get a BD */
1473 bd_prod = TX_BD(NEXT_TX_IDX(bd_prod)); 1474 bd_prod = TX_BD(NEXT_TX_IDX(bd_prod));
1475
1474 pbd_e1x = &fp_tx->tx_desc_ring[bd_prod].parse_bd_e1x; 1476 pbd_e1x = &fp_tx->tx_desc_ring[bd_prod].parse_bd_e1x;
1475 pbd_e2 = &fp_tx->tx_desc_ring[bd_prod].parse_bd_e2; 1477 pbd_e2 = &fp_tx->tx_desc_ring[bd_prod].parse_bd_e2;
1476 1478
@@ -1714,6 +1716,7 @@ static void bnx2x_self_test(struct net_device *dev,
1714 buf[1] = 1; 1716 buf[1] = 1;
1715 etest->flags |= ETH_TEST_FL_FAILED; 1717 etest->flags |= ETH_TEST_FL_FAILED;
1716 } 1718 }
1719
1717 buf[2] = bnx2x_test_loopback(bp, link_up); 1720 buf[2] = bnx2x_test_loopback(bp, link_up);
1718 if (buf[2] != 0) 1721 if (buf[2] != 0)
1719 etest->flags |= ETH_TEST_FL_FAILED; 1722 etest->flags |= ETH_TEST_FL_FAILED;