Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ba1039 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by David S. Miller
Browse files

bgmac: fix "cmdcfg" calls for promisc and loopback modes 



The last (bool) parameter in bgmac_cmdcfg_maskset says if the write
should be made, even if value didn't change. Currently driver doesn't
match the specs about (not) forcing some changes. This makes it follow
them.

Reported-by: default avatarNathan Hintz <nlhintz@hotmail.com>
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d166f218

drivers/net/ethernet/broadcom/bgmac.c

+4 −4
Original line number Diff line number Diff line
@@ -776,9 +776,9 @@ static void bgmac_set_rx_mode(struct net_device *net_dev) 
	struct bgmac *bgmac = netdev_priv(net_dev);



	if (net_dev->flags & IFF_PROMISC)

		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_PROM, false);

		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_PROM, true);

	else

		bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_PROM, 0, false);

		bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_PROM, 0, true);

}



#if 0 /* We don't use that regs yet */
@@ -1039,9 +1039,9 @@ static void bgmac_chip_init(struct bgmac *bgmac, bool full_init) 
	bgmac_write_mac_address(bgmac, bgmac->net_dev->dev_addr);



	if (bgmac->loopback)

		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_ML, true);

		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_ML, false);

	else

		bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_ML, 0, true);

		bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_ML, 0, false);



	bgmac_write(bgmac, BGMAC_RXMAX_LENGTH, 32 + ETHER_MAX_LEN);