Messages in this thread | | | Date | Tue, 21 Apr 2020 15:41:53 -0700 (PDT) | Subject | Re: [PATCH net-next 1/1] net: stmmac: Add support for VLAN promiscuous mode | From | David Miller <> |
| |
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.
| |