All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] net: bgmac: store MAC address directly in netdev->dev_addr
@ 2017-02-16 14:11 Tobias Klauser
  2017-02-17 13:45 ` Jon Mason
  2017-02-17 18:03 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Tobias Klauser @ 2017-02-16 14:11 UTC (permalink / raw)
  To: netdev; +Cc: rafal, f.fainelli, jon.mason, arnd

After commit 34a5102c3235 ("net: bgmac: allocate struct bgmac just once
& don't copy it") the mac_addr member of struct bgmac is no longer
necessary to pass the MAC address to bgmac_enet_probe(). Instead it can
directly be stored in netdev->dev_addr.

Also use eth_hw_addr_random() instead of eth_random_addr() in case a
random MAC is nedded. This will make sure netdev->addr_assign_type will
be properly set.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/net/ethernet/broadcom/bgmac-bcma.c     | 2 +-
 drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +-
 drivers/net/ethernet/broadcom/bgmac.c          | 9 ++++-----
 drivers/net/ethernet/broadcom/bgmac.h          | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c
index 5ef60d4f12b4..d59cfcc4c4d5 100644
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
@@ -144,7 +144,7 @@ static int bgmac_probe(struct bcma_device *core)
 		goto err;
 	}
 
-	ether_addr_copy(bgmac->mac_addr, mac);
+	ether_addr_copy(bgmac->net_dev->dev_addr, mac);
 
 	/* On BCM4706 we need common core to access PHY */
 	if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index 805e6ed6c390..7b1af950f312 100644
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -169,7 +169,7 @@ static int bgmac_probe(struct platform_device *pdev)
 
 	mac_addr = of_get_mac_address(np);
 	if (mac_addr)
-		ether_addr_copy(bgmac->mac_addr, mac_addr);
+		ether_addr_copy(bgmac->net_dev->dev_addr, mac_addr);
 	else
 		dev_warn(&pdev->dev, "MAC address not present in device tree\n");
 
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 20fe2520da42..415046750bb4 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1477,14 +1477,13 @@ int bgmac_enet_probe(struct bgmac *bgmac)
 	net_dev->irq = bgmac->irq;
 	SET_NETDEV_DEV(net_dev, bgmac->dev);
 
-	if (!is_valid_ether_addr(bgmac->mac_addr)) {
+	if (!is_valid_ether_addr(net_dev->dev_addr)) {
 		dev_err(bgmac->dev, "Invalid MAC addr: %pM\n",
-			bgmac->mac_addr);
-		eth_random_addr(bgmac->mac_addr);
+			net_dev->dev_addr);
+		eth_hw_addr_random(net_dev);
 		dev_warn(bgmac->dev, "Using random MAC: %pM\n",
-			 bgmac->mac_addr);
+			 net_dev->dev_addr);
 	}
-	ether_addr_copy(net_dev->dev_addr, bgmac->mac_addr);
 
 	/* This (reset &) enable is not preset in specs or reference driver but
 	 * Broadcom does it in arch PCI code when enabling fake PCI device.
diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h
index ab2db76e4fb8..248727dc62f2 100644
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
@@ -474,7 +474,6 @@ struct bgmac {
 
 	struct device *dev;
 	struct device *dma_dev;
-	unsigned char mac_addr[ETH_ALEN];
 	u32 feature_flags;
 
 	struct net_device *net_dev;
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] net: bgmac: store MAC address directly in netdev->dev_addr
  2017-02-16 14:11 [PATCH] net: bgmac: store MAC address directly in netdev->dev_addr Tobias Klauser
@ 2017-02-17 13:45 ` Jon Mason
  2017-02-17 18:03 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2017-02-17 13:45 UTC (permalink / raw)
  To: Tobias Klauser
  Cc: Network Development, Rafał Miłecki, Florian Fainelli,
	Arnd Bergmann

On Thu, Feb 16, 2017 at 9:11 AM, Tobias Klauser <tklauser@distanz.ch> wrote:
> After commit 34a5102c3235 ("net: bgmac: allocate struct bgmac just once
> & don't copy it") the mac_addr member of struct bgmac is no longer
> necessary to pass the MAC address to bgmac_enet_probe(). Instead it can
> directly be stored in netdev->dev_addr.
>
> Also use eth_hw_addr_random() instead of eth_random_addr() in case a
> random MAC is nedded. This will make sure netdev->addr_assign_type will
> be properly set.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Looks sane to me

Acked-by: Jon Mason <jon.mason@broadcom.com>

> ---
>  drivers/net/ethernet/broadcom/bgmac-bcma.c     | 2 +-
>  drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +-
>  drivers/net/ethernet/broadcom/bgmac.c          | 9 ++++-----
>  drivers/net/ethernet/broadcom/bgmac.h          | 1 -
>  4 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c
> index 5ef60d4f12b4..d59cfcc4c4d5 100644
> --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
> +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
> @@ -144,7 +144,7 @@ static int bgmac_probe(struct bcma_device *core)
>                 goto err;
>         }
>
> -       ether_addr_copy(bgmac->mac_addr, mac);
> +       ether_addr_copy(bgmac->net_dev->dev_addr, mac);
>
>         /* On BCM4706 we need common core to access PHY */
>         if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&
> diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
> index 805e6ed6c390..7b1af950f312 100644
> --- a/drivers/net/ethernet/broadcom/bgmac-platform.c
> +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
> @@ -169,7 +169,7 @@ static int bgmac_probe(struct platform_device *pdev)
>
>         mac_addr = of_get_mac_address(np);
>         if (mac_addr)
> -               ether_addr_copy(bgmac->mac_addr, mac_addr);
> +               ether_addr_copy(bgmac->net_dev->dev_addr, mac_addr);
>         else
>                 dev_warn(&pdev->dev, "MAC address not present in device tree\n");
>
> diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
> index 20fe2520da42..415046750bb4 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.c
> +++ b/drivers/net/ethernet/broadcom/bgmac.c
> @@ -1477,14 +1477,13 @@ int bgmac_enet_probe(struct bgmac *bgmac)
>         net_dev->irq = bgmac->irq;
>         SET_NETDEV_DEV(net_dev, bgmac->dev);
>
> -       if (!is_valid_ether_addr(bgmac->mac_addr)) {
> +       if (!is_valid_ether_addr(net_dev->dev_addr)) {
>                 dev_err(bgmac->dev, "Invalid MAC addr: %pM\n",
> -                       bgmac->mac_addr);
> -               eth_random_addr(bgmac->mac_addr);
> +                       net_dev->dev_addr);
> +               eth_hw_addr_random(net_dev);
>                 dev_warn(bgmac->dev, "Using random MAC: %pM\n",
> -                        bgmac->mac_addr);
> +                        net_dev->dev_addr);
>         }
> -       ether_addr_copy(net_dev->dev_addr, bgmac->mac_addr);
>
>         /* This (reset &) enable is not preset in specs or reference driver but
>          * Broadcom does it in arch PCI code when enabling fake PCI device.
> diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h
> index ab2db76e4fb8..248727dc62f2 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.h
> +++ b/drivers/net/ethernet/broadcom/bgmac.h
> @@ -474,7 +474,6 @@ struct bgmac {
>
>         struct device *dev;
>         struct device *dma_dev;
> -       unsigned char mac_addr[ETH_ALEN];
>         u32 feature_flags;
>
>         struct net_device *net_dev;
> --
> 2.11.0
>
>

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] net: bgmac: store MAC address directly in netdev->dev_addr
  2017-02-16 14:11 [PATCH] net: bgmac: store MAC address directly in netdev->dev_addr Tobias Klauser
  2017-02-17 13:45 ` Jon Mason
@ 2017-02-17 18:03 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-02-17 18:03 UTC (permalink / raw)
  To: tklauser; +Cc: netdev, rafal, f.fainelli, jon.mason, arnd

From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 16 Feb 2017 15:11:19 +0100

> After commit 34a5102c3235 ("net: bgmac: allocate struct bgmac just once
> & don't copy it") the mac_addr member of struct bgmac is no longer
> necessary to pass the MAC address to bgmac_enet_probe(). Instead it can
> directly be stored in netdev->dev_addr.
> 
> Also use eth_hw_addr_random() instead of eth_random_addr() in case a
> random MAC is nedded. This will make sure netdev->addr_assign_type will
> be properly set.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Applied to net-next, thank you.

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-17 18:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-16 14:11 [PATCH] net: bgmac: store MAC address directly in netdev->dev_addr Tobias Klauser
2017-02-17 13:45 ` Jon Mason
2017-02-17 18:03 ` David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.