aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Fujinaka <todd.fujinaka@intel.com>2014-03-03 21:25:22 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-03-08 03:31:49 -0500
commit72b36727080c712859d4b8b363ae5ddadb81a0d3 (patch)
treeca1a239695cdbe8eaa7bc6645a3b6b1af9f28573
parentbd9d55929df54b67708460d7eda84a7d7924009d (diff)
igb: fix array size calculation
Use ARRAY_SIZE for array size calculation. Signed-off-by: Todd Fujinaka <todd.fujinaka@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/igb/e1000_82575.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index 45947b3f7d92..1da4e87cc879 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -76,8 +76,6 @@ static s32 igb_update_nvm_checksum_i350(struct e1000_hw *hw);
76static const u16 e1000_82580_rxpbs_table[] = 76static const u16 e1000_82580_rxpbs_table[] =
77 { 36, 72, 144, 1, 2, 4, 8, 16, 77 { 36, 72, 144, 1, 2, 4, 8, 16,
78 35, 70, 140 }; 78 35, 70, 140 };
79#define E1000_82580_RXPBS_TABLE_SIZE \
80 (sizeof(e1000_82580_rxpbs_table)/sizeof(u16))
81 79
82/** 80/**
83 * igb_sgmii_uses_mdio_82575 - Determine if I2C pins are for external MDIO 81 * igb_sgmii_uses_mdio_82575 - Determine if I2C pins are for external MDIO
@@ -2307,7 +2305,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
2307{ 2305{
2308 u16 ret_val = 0; 2306 u16 ret_val = 0;
2309 2307
2310 if (data < E1000_82580_RXPBS_TABLE_SIZE) 2308 if (data < ARRAY_SIZE(e1000_82580_rxpbs_table))
2311 ret_val = e1000_82580_rxpbs_table[data]; 2309 ret_val = e1000_82580_rxpbs_table[data];
2312 2310
2313 return ret_val; 2311 return ret_val;