diff options
| author |   Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-08 18:44:50 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-08 19:49:32 -0800 |
| commit | f4f9a5e6cc7341c6c74060ee5a594d395c364c6f (patch) | |
| tree | bc27ca1d9a8db3f2d610994d4336e029d2e66e09 | |
| parent | OVS: remove use of VLAN_TAG_PRESENT (diff) | |
| download | linux-dev-f4f9a5e6cc7341c6c74060ee5a594d395c364c6f.tar.xz linux-dev-f4f9a5e6cc7341c6c74060ee5a594d395c364c6f.zip | |
gianfar: remove use of VLAN_TAG_PRESENT
Reviewed-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 0d76e15cd6dd..241325c35cb4 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -1134,11 +1134,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; } } |