On Tue, Feb 22, 2022 at 7:20 PM Weiguo Li <liw...@foxmail.com> wrote:
> @@ -713,21 +714,28 @@ ice_hash_parse_raw_pattern(struct ice_adapter *ad,
> msk_buf[j] = tmp_val * 16 + tmp_c - '0';
> }
>
> - if (ice_parser_create(&ad->hw, &psr))
> - return -rte_errno;
> - if (ice_parser_run(psr, pkt_buf, pkt_len, &rslt))
> - return -rte_errno;
> + if (ice_parser_create(&ad->hw, &psr)) {
> + ret = -rte_errno;
> + goto exit;
> + }
> + if (ice_parser_run(psr, pkt_buf, pkt_len, &rslt)) {
> + ret = -rte_errno;
> + goto exit;
> + }
This part of the patch seems to conflict.
Can you double check and rebase?
Thanks.
--
David Marchand
