* [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000
@ 2012-04-03 17:44 Marc Kleine-Budde
2012-04-03 18:20 ` Eric Dumazet
2012-04-04 6:59 ` Giuseppe CAVALLARO
0 siblings, 2 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2012-04-03 17:44 UTC (permalink / raw)
To: peppe.cavallaro; +Cc: rayagond, netdev, Marc Kleine-Budde
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;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000
2012-04-03 17:44 [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000 Marc Kleine-Budde
@ 2012-04-03 18:20 ` Eric Dumazet
2012-04-04 7:33 ` Marc Kleine-Budde
2012-04-04 6:59 ` Giuseppe CAVALLARO
1 sibling, 1 reply; 5+ messages in thread
From: Eric Dumazet @ 2012-04-03 18:20 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: peppe.cavallaro, rayagond, netdev
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)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000
2012-04-03 18:20 ` Eric Dumazet
@ 2012-04-04 7:33 ` Marc Kleine-Budde
0 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2012-04-04 7:33 UTC (permalink / raw)
To: Eric Dumazet; +Cc: peppe.cavallaro, rayagond, netdev
[-- Attachment #1: Type: text/plain, Size: 1872 bytes --]
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
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000
2012-04-03 17:44 [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000 Marc Kleine-Budde
2012-04-03 18:20 ` Eric Dumazet
@ 2012-04-04 6:59 ` Giuseppe CAVALLARO
2012-04-04 7:33 ` Marc Kleine-Budde
1 sibling, 1 reply; 5+ messages in thread
From: Giuseppe CAVALLARO @ 2012-04-04 6:59 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: rayagond, netdev
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;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000
2012-04-04 6:59 ` Giuseppe CAVALLARO
@ 2012-04-04 7:33 ` Marc Kleine-Budde
0 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2012-04-04 7:33 UTC (permalink / raw)
To: Giuseppe CAVALLARO; +Cc: rayagond, netdev
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
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
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-04 8:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-03 17:44 [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000 Marc Kleine-Budde
2012-04-03 18:20 ` Eric Dumazet
2012-04-04 7:33 ` Marc Kleine-Budde
2012-04-04 6:59 ` Giuseppe CAVALLARO
2012-04-04 7:33 ` Marc Kleine-Budde
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).