[dpdk-dev] [PATCH v8 0/7] link bonding
Thomas Monjalon
thomas.monjalon at 6wind.com
Tue Nov 25 12:20:42 CET 2014
2014-11-25 10:56, Jastrzebski, MichalX K:
> I noticed some problems with applying link bonding mode 4 patches after you applied Declan's patches.
> Link bonding mode 4 0001-bond-add-mode-4-support.patch won't apply because of this error:
> Checking patch lib/librte_pmd_bond/rte_eth_bond_private.h...
> error: while searching for:
> #define RTE_BOND_LOG(lvl, msg, ...) \
> RTE_LOG(lvl, PMD, "%s(%d) - " msg "\n", __func__, __LINE__, ##__VA_ARGS__);
>
> extern const char *pmd_bond_init_valid_arguments[];
>
> extern const char *driver_name;
>
> error: patch failed: lib/librte_pmd_bond/rte_eth_bond_private.h:60
> error: lib/librte_pmd_bond/rte_eth_bond_private.h: patch does not apply
>
> This happens because originally in Declan's [PATCH v8 6/7] bond: lsc polling support there is a semicolon
> at the end of RTE_LOG... line , and my patch is looking for this semicolon also.
> So do you want me to send a v6 patch fixing this issue?
I can fix this type of conflict by myself but I want you send a v6
because v5 had no commit log.
I want also a review from Declan. If it's already done, please add the acked-by
in your patch.
> The second issue is that Link bonding mode 4 0002-testpmd-add-mode-4-support.patch won't
> apply also, because of this error;
> error: while searching for:
> /* Update number of ports */
> nb_ports = rte_eth_dev_count();
> reconfig(port_id, res->socket);
> rte_eth_promiscuous_enable(port_id);
> }
>
>
> error: patch failed: app/test-pmd/cmdline.c:3646
> error: app/test-pmd/cmdline.c: patch does not apply
>
> This is probably because you didn't apply Declan's patch:
> [PATCH v8 5/7] testpmd: adding parameter to reconfig
Oh yes ! It's totally my fault. The patch has mysteriously disappeared.
It's fixed now.
Thanks for reporting
--
Thomas
More information about the dev
mailing list