>-----Original Message----- >From: Michał Mirosław [mailto:mirq-li...@rere.qmqm.pl] >Sent: Tuesday, December 13, 2016 2:13 AM >To: netdev@vger.kernel.org >Cc: Claudiu Manoil <claudiu.man...@freescale.com> >Subject: [PATCH net-next 07/27] gianfar: remove use of VLAN_TAG_PRESENT > >Signed-off-by: Michał Mirosław <mirq-li...@rere.qmqm.pl> >--- > drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > >diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c >b/drivers/net/ethernet/freescale/gianfar_ethtool.c >index 56588f2..95fa647 100644 >--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c >+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c >@@ -1155,11 +1155,9 @@ static int gfar_convert_to_filer(struct >ethtool_rx_flow_spec *rule, > prio = vlan_tci_prio(rule); > prio_mask = vlan_tci_priom(rule); > >- if (cfi == VLAN_TAG_PRESENT && cfi_mask == >VLAN_TAG_PRESENT) { >- vlan |= RQFPR_CFI; >- vlan_mask |= RQFPR_CFI; >- } else if (cfi != VLAN_TAG_PRESENT && >- cfi_mask == VLAN_TAG_PRESENT) { >+ if (cfi_mask) { >+ if (cfi) >+ vlan |= RQFPR_CFI; > vlan_mask |= RQFPR_CFI; > } > }
Reviewed-by: Claudiu Manoil <claudiu.man...@nxp.com>