Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 21 Apr 2020 15:41:53 -0700 (PDT)
Message-Id: <20200421.154153.172396683183248740.davem@davemloft.net>
To:     vee.khee.wong@intel.com
Cc:     peppe.cavallaro@st.com, alexandre.torgue@st.com,
        joabreu@synopsys.com, mcoquelin.stm32@gmail.com,
        netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        boon.leong.ong@intel.com, weifeng.voon@intel.com
Subject: Re: [PATCH net-next 1/1] net: stmmac: Add support for VLAN
 promiscuous mode
From:   David Miller <davem@davemloft.net>
In-Reply-To: <20200420033359.11610-1-vee.khee.wong@intel.com>
References: <20200420033359.11610-1-vee.khee.wong@intel.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Wong Vee Khee <vee.khee.wong@intel.com>
Date: Mon, 20 Apr 2020 11:33:59 +0800

> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index e6898fd5223f..80250c7be783 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -4877,7 +4877,6 @@ int stmmac_dvr_probe(struct device *device,
>  		}
>  	}
>  
> -	ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
>  	ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
>  #ifdef STMMAC_VLAN_TAG_USED
>  	/* Both mac100 and gmac support receive VLAN tag detection */
> @@ -4892,6 +4891,7 @@ int stmmac_dvr_probe(struct device *device,
>  			ndev->features |= NETIF_F_HW_VLAN_STAG_TX;
>  	}
>  #endif
> +	ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
>  	priv->msg_enable = netif_msg_init(debug, default_msg_level);

This change has no effect, because hw_features does not change across
this code block you are moving the line across.

So please remove this part of the patch it is pointless and makes your
change harder to review.