netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bgmac: fix "cmdcfg" calls for promisc and loopback modes
@ 2013-02-07 10:23 Rafał Miłecki
  2013-02-07 14:55 ` Florian Fainelli
  2013-02-07 15:40 ` [PATCH V2] " Rafał Miłecki
  0 siblings, 2 replies; 4+ messages in thread
From: Rafał Miłecki @ 2013-02-07 10:23 UTC (permalink / raw)
  To: netdev, David S. Miller; +Cc: Nathan Hintz, Rafał Miłecki

This makes code match the specs.

Reported-by: Nathan Hintz <nlhintz@hotmail.com>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 drivers/net/ethernet/broadcom/bgmac.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index f90d1dc..8cf5e39 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -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);
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] bgmac: fix "cmdcfg" calls for promisc and loopback modes
  2013-02-07 10:23 [PATCH] bgmac: fix "cmdcfg" calls for promisc and loopback modes Rafał Miłecki
@ 2013-02-07 14:55 ` Florian Fainelli
  2013-02-07 15:40 ` [PATCH V2] " Rafał Miłecki
  1 sibling, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2013-02-07 14:55 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: netdev, David S. Miller, Nathan Hintz

Hello Rafal,

On 02/07/2013 11:23 AM, Rafał Miłecki wrote:
> 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!

>
> Reported-by: Nathan Hintz <nlhintz@hotmail.com>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
>   drivers/net/ethernet/broadcom/bgmac.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
> index f90d1dc..8cf5e39 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.c
> +++ b/drivers/net/ethernet/broadcom/bgmac.c
> @@ -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);
>
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH V2] bgmac: fix "cmdcfg" calls for promisc and loopback modes
  2013-02-07 10:23 [PATCH] bgmac: fix "cmdcfg" calls for promisc and loopback modes Rafał Miłecki
  2013-02-07 14:55 ` Florian Fainelli
@ 2013-02-07 15:40 ` Rafał Miłecki
  2013-02-08 22:44   ` David Miller
  1 sibling, 1 reply; 4+ messages in thread
From: Rafał Miłecki @ 2013-02-07 15:40 UTC (permalink / raw)
  To: netdev, David S. Miller; +Cc: Nathan Hintz, Rafał Miłecki

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: Nathan Hintz <nlhintz@hotmail.com>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
V2: commit message
---
 drivers/net/ethernet/broadcom/bgmac.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index f90d1dc..8cf5e39 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -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);
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH V2] bgmac: fix "cmdcfg" calls for promisc and loopback modes
  2013-02-07 15:40 ` [PATCH V2] " Rafał Miłecki
@ 2013-02-08 22:44   ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-02-08 22:44 UTC (permalink / raw)
  To: zajec5; +Cc: netdev, nlhintz

From: Rafał Miłecki <zajec5@gmail.com>
Date: Thu,  7 Feb 2013 16:40:38 +0100

> 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: Nathan Hintz <nlhintz@hotmail.com>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-02-08 22:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-07 10:23 [PATCH] bgmac: fix "cmdcfg" calls for promisc and loopback modes Rafał Miłecki
2013-02-07 14:55 ` Florian Fainelli
2013-02-07 15:40 ` [PATCH V2] " Rafał Miłecki
2013-02-08 22:44   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).