bgmac: fix "cmdcfg" calls for promisc and loopback modes
Subsystems (3)
PATCH 1/1 bgmac: fix "cmdcfg" calls for promisc and loopback modes
This makes code match the specs.
--- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +4 -4
@@ -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 );
Signature · 1 line
1.7.10.4
Hello Rafal,
Quoted 1 line · Rafał Miłecki
This makes code match the specs.
And this probably deserves a better commit message too. Especially as you are inverting booleans, without the actual consumer of that boolean parameter being in the context of the patch.
Thanks!
Quoted 36 lines
Reported-by Nathan Hintz <[email protected]>Signed-off-by Rafał Miłecki <[email protected]>--- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/net/ethernet/broadcom/bgmac.c +4
-4@@ -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 );
PATCH v2 1/1 bgmac: fix "cmdcfg" calls for promisc and loopback modes
In reply to Rafał MiłeckiThe 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.
---
V2: commit message
--- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +4 -4
@@ -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 );
Signature · 1 line
1.7.10.4
From: Rafał Miłecki <[email protected]>
Date: Thu, 7 Feb 2013 16:40:38 +0100
Quoted 7 lines
The last (bool) parameter in
bgmac_cmdcfg_masksetsays 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 Nathan Hintz <[email protected]>Signed-off-by Rafał Miłecki <[email protected]>
Applied.