diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-09-08 07:17:09 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-09-08 07:17:09 +0100 |
| commit | 77658ec40daba6344d0d54976dc9e08a5717d1cd (patch) | |
| tree | 6c32a4d540b6b4b7d1e3a7dc468a0426d67c2d57 /drivers/net/i40e/i40e_flow.c | |
| parent | f26b4a32d483efc65cb0a327e2e73d6f3ddfc218 (diff) | |
Imported upstream version 17.05.217.05.x
Diffstat (limited to 'drivers/net/i40e/i40e_flow.c')
| -rw-r--r-- | drivers/net/i40e/i40e_flow.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 24e1c65..c1dac38 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -1821,8 +1821,10 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, } /* Get filter specification */ - if ((o_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK)) && - (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) { + if ((o_vlan_mask != NULL) && (o_vlan_mask->tci == + rte_cpu_to_be_16(I40E_TCI_MASK)) && + (i_vlan_mask != NULL) && + (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) { filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci) & I40E_TCI_MASK; filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci) |