Re: [PATCH] stmmac: re-add IFF_UNICAST_FLT for dwmac1000

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- 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 --]