Patchwork stmmac: re-add IFF_UNICAST_FLT for dwmac1000

login
register
mail settings
Submitter Marc Kleine-Budde
Date April 3, 2012, 5:44 p.m.
Message ID <1333475057-3752-1-git-send-email-mkl@pengutronix.de>
Download mbox | patch
Permalink /patch/150486/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Marc Kleine-Budde - April 3, 2012, 5:44 p.m.
In commit (bfab27a stmmac: add the experimental PCI support) the
IFF_UNICAST_FLT flag has been removed from the stmmac_mac_device_setup()
function. This patch re-adds the flag.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

Just compile time tested, since I don't have the hardware.
Applies to net-next/master (and v3.3).

regards, Marc

 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Eric Dumazet - April 3, 2012, 6:20 p.m.
On Tue, 2012-04-03 at 19:44 +0200, Marc Kleine-Budde wrote:
> In commit (bfab27a stmmac: add the experimental PCI support) the
> IFF_UNICAST_FLT flag has been removed from the stmmac_mac_device_setup()
> function. This patch re-adds the flag.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> 
> Just compile time tested, since I don't have the hardware.
> Applies to net-next/master (and v3.3).
> 
> regards, Marc
> 
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index e85ffbd..07e0c78 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -1737,9 +1737,10 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
>  	struct mac_device_info *mac;
>  
>  	/* Identify the MAC HW device */
> -	if (priv->plat->has_gmac)
> +	if (priv->plat->has_gmac) {
> +		priv->dev->priv_flags |= IFF_UNICAST_FLT;
>  		mac = dwmac1000_setup(priv->ioaddr);
> -	else
> +	} else
>  		mac = dwmac100_setup(priv->ioaddr);
>  	if (!mac)
>  		return -ENOMEM;


	if (priv->plat->has_gmac) {
		priv->dev->priv_flags |= IFF_UNICAST_FLT;
		mac = dwmac1000_setup(priv->ioaddr);
	} else {
		mac = dwmac100_setup(priv->ioaddr);
	}

(Documentation/CodingStyle line 175)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Giuseppe CAVALLARO - April 4, 2012, 6:59 a.m.
On 4/3/2012 7:44 PM, Marc Kleine-Budde wrote:
> In commit (bfab27a stmmac: add the experimental PCI support) the

I get another patch associated to this commit:

git show db8857b
commit db8857bf5bd888d763e1984f9449d0b824b39ee1
Author: Florian Fainelli <florian@openwrt.org>
Date:   Mon Jan 9 23:59:20 2012 +0000

    stmmac: use an unique MDIO bus name.

    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>


maybe, the commit should be:

git-show bfab27a14
commit bfab27a146ed4d722c6d399f844f955f29cd2b81
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date:   Wed Dec 21 03:58:19 2011 +0000

    stmmac: add the experimental PCI support


> IFF_UNICAST_FLT flag has been removed from the stmmac_mac_device_setup()
> function. This patch re-adds the flag.

Yes this flag was removed by this PCI patch.
So it makes sense to re-add it!

> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>

> ---
> 
> Just compile time tested, since I don't have the hardware.
> Applies to net-next/master (and v3.3).
> 
> regards, Marc
> 
>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index e85ffbd..07e0c78 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -1737,9 +1737,10 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
>  	struct mac_device_info *mac;
>  
>  	/* Identify the MAC HW device */
> -	if (priv->plat->has_gmac)
> +	if (priv->plat->has_gmac) {
> +		priv->dev->priv_flags |= IFF_UNICAST_FLT;
>  		mac = dwmac1000_setup(priv->ioaddr);
> -	else
> +	} else
>  		mac = dwmac100_setup(priv->ioaddr);
>  	if (!mac)
>  		return -ENOMEM;

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marc Kleine-Budde - April 4, 2012, 7:33 a.m.
On 04/04/2012 08:59 AM, Giuseppe CAVALLARO wrote:
> On 4/3/2012 7:44 PM, Marc Kleine-Budde wrote:
>> In commit (bfab27a stmmac: add the experimental PCI support) the
              ^^^^^^^
> 
> I get another patch associated to this commit:
> 
> git show db8857b
           ^^^^^^^

Copy paste problem on your side?

> commit db8857bf5bd888d763e1984f9449d0b824b39ee1
> Author: Florian Fainelli <florian@openwrt.org>
> Date:   Mon Jan 9 23:59:20 2012 +0000
> 
>     stmmac: use an unique MDIO bus name.
> 
>     Signed-off-by: Florian Fainelli <florian@openwrt.org>
>     Signed-off-by: David S. Miller <davem@davemloft.net>
> 
> 
> maybe, the commit should be:
> 
> git-show bfab27a14
           ^^^^^^^^^

Yes, as I've written in my commit message.

> commit bfab27a146ed4d722c6d399f844f955f29cd2b81
> Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
> Date:   Wed Dec 21 03:58:19 2011 +0000
> 
>     stmmac: add the experimental PCI support
> 
> 
>> IFF_UNICAST_FLT flag has been removed from the stmmac_mac_device_setup()
>> function. This patch re-adds the flag.
> 
> Yes this flag was removed by this PCI patch.
> So it makes sense to re-add it!
> 
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>

Tnx.


Marc
Marc Kleine-Budde - April 4, 2012, 7:33 a.m.
On 04/03/2012 08:20 PM, Eric Dumazet wrote:
> On Tue, 2012-04-03 at 19:44 +0200, Marc Kleine-Budde wrote:
>> In commit (bfab27a stmmac: add the experimental PCI support) the
>> IFF_UNICAST_FLT flag has been removed from the stmmac_mac_device_setup()
>> function. This patch re-adds the flag.
>>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> ---
>>
>> Just compile time tested, since I don't have the hardware.
>> Applies to net-next/master (and v3.3).
>>
>> regards, Marc
>>
>>  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    5 +++--
>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> index e85ffbd..07e0c78 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> @@ -1737,9 +1737,10 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
>>  	struct mac_device_info *mac;
>>  
>>  	/* Identify the MAC HW device */
>> -	if (priv->plat->has_gmac)
>> +	if (priv->plat->has_gmac) {
>> +		priv->dev->priv_flags |= IFF_UNICAST_FLT;
>>  		mac = dwmac1000_setup(priv->ioaddr);
>> -	else
>> +	} else
>>  		mac = dwmac100_setup(priv->ioaddr);
>>  	if (!mac)
>>  		return -ENOMEM;
> 
> 
> 	if (priv->plat->has_gmac) {
> 		priv->dev->priv_flags |= IFF_UNICAST_FLT;
> 		mac = dwmac1000_setup(priv->ioaddr);
> 	} else {
> 		mac = dwmac100_setup(priv->ioaddr);
> 	}
> 
> (Documentation/CodingStyle line 175)

Thanks for the hint.

Marc

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e85ffbd..07e0c78 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1737,9 +1737,10 @@  static int stmmac_hw_init(struct stmmac_priv *priv)
 	struct mac_device_info *mac;
 
 	/* Identify the MAC HW device */
-	if (priv->plat->has_gmac)
+	if (priv->plat->has_gmac) {
+		priv->dev->priv_flags |= IFF_UNICAST_FLT;
 		mac = dwmac1000_setup(priv->ioaddr);
-	else
+	} else
 		mac = dwmac100_setup(priv->ioaddr);
 	if (!mac)
 		return -ENOMEM;