Commit 3dab99e0 authored by Vince Bridgers's avatar Vince Bridgers Committed by David S. Miller

stmmac: correct mc_filter local variable in set_filter and set_mac_addr call

Testing revealed that the local variable mc_filter was dimensioned
incorrectly for all possible configurations and get_mac_addr should
have been set_mac_addr (a typo). Make sure mc_filter is dimensioned
to 8 32-bit unsigned longs - the largest size of the Synopsys
multicast filter register set.
Signed-off-by: default avatarVince Bridgers <vbridger@opensource.altera.com>
Acked-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b3d136c
...@@ -134,7 +134,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw, ...@@ -134,7 +134,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,
void __iomem *ioaddr = (void __iomem *)dev->base_addr; void __iomem *ioaddr = (void __iomem *)dev->base_addr;
unsigned int value = 0; unsigned int value = 0;
unsigned int perfect_addr_number = hw->unicast_filter_entries; unsigned int perfect_addr_number = hw->unicast_filter_entries;
u32 mc_filter[2]; u32 mc_filter[8];
int mcbitslog2 = hw->mcast_bits_log2; int mcbitslog2 = hw->mcast_bits_log2;
pr_debug("%s: # mcasts %d, # unicast %d\n", __func__, pr_debug("%s: # mcasts %d, # unicast %d\n", __func__,
...@@ -182,7 +182,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw, ...@@ -182,7 +182,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
netdev_for_each_uc_addr(ha, dev) { netdev_for_each_uc_addr(ha, dev) {
stmmac_get_mac_addr(ioaddr, ha->addr, stmmac_set_mac_addr(ioaddr, ha->addr,
GMAC_ADDR_HIGH(reg), GMAC_ADDR_HIGH(reg),
GMAC_ADDR_LOW(reg)); GMAC_ADDR_LOW(reg));
reg++; reg++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment