aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorRongQing.Li <roy.qing.li@gmail.com>2012-04-26 17:01:12 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-28 21:59:17 -0400
commitd89bdff152acc0c1e1c8093832547a553b69b45c (patch)
tree9248eec24ae17f2b3f12705de5d14a35e4cd8b20 /drivers/net/ethernet
parent86cc070eb19640d42941d3074e42c761d4c1c59c (diff)
drivers/net/oki-semi: Remove the definition of PCH_GBE_ETH_ALEN
PCH_GBE_ETH_ALEN is equal to ETH_ALEN, so we can replace it with ETH_ALEN. If they are not equal, it must be a bug, since this is ethernet, and the address has been already stored to mc_addr_list as ETH_ALEN bytes when call pch_gbe_mac_mc_addr_list_update. Signed-off-by: RongQing.Li <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 89c6bcf4bca2..835e3bbdac18 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -79,7 +79,6 @@ const char pch_driver_version[] = DRV_VERSION;
79#define PCH_GBE_PAUSE_PKT4_VALUE 0x01000888 79#define PCH_GBE_PAUSE_PKT4_VALUE 0x01000888
80#define PCH_GBE_PAUSE_PKT5_VALUE 0x0000FFFF 80#define PCH_GBE_PAUSE_PKT5_VALUE 0x0000FFFF
81 81
82#define PCH_GBE_ETH_ALEN 6
83 82
84/* This defines the bits that are set in the Interrupt Mask 83/* This defines the bits that are set in the Interrupt Mask
85 * Set/Read Register. Each bit is documented below: 84 * Set/Read Register. Each bit is documented below:
@@ -519,7 +518,7 @@ static void pch_gbe_mac_mc_addr_list_update(struct pch_gbe_hw *hw,
519 if (mc_addr_count) { 518 if (mc_addr_count) {
520 pch_gbe_mac_mar_set(hw, mc_addr_list, i); 519 pch_gbe_mac_mar_set(hw, mc_addr_list, i);
521 mc_addr_count--; 520 mc_addr_count--;
522 mc_addr_list += PCH_GBE_ETH_ALEN; 521 mc_addr_list += ETH_ALEN;
523 } else { 522 } else {
524 /* Clear MAC address mask */ 523 /* Clear MAC address mask */
525 adrmask = ioread32(&hw->reg->ADDR_MASK); 524 adrmask = ioread32(&hw->reg->ADDR_MASK);