| Message ID | 091bdc88-9386-288e-25ba-7d369ad9a6b5@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0e949725908b66dd9ad2cc27dc98fe782627ac8b |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2] tc/m_vlan: fix print_vlan() conditional on TCA_VLAN_ACT_PUSH_ETH | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, 17 Nov 2021 21:05:33 +0300 Maxim Petrov <mmrmaximuzz@gmail.com> wrote: > Fix the wild bracket in the if clause leading to the error in the condition. > > Signed-off-by: Maxim Petrov <mmrmaximuzz@gmail.com> > --- > tc/m_vlan.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tc/m_vlan.c b/tc/m_vlan.c > index 221083df..1b2b1d51 100644 > --- a/tc/m_vlan.c > +++ b/tc/m_vlan.c > @@ -279,8 +279,8 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg) > ETH_ALEN, 0, b1, sizeof(b1)); > print_string(PRINT_ANY, "dst_mac", " dst_mac %s", b1); > } > - if (tb[TCA_VLAN_PUSH_ETH_SRC && > - RTA_PAYLOAD(tb[TCA_VLAN_PUSH_ETH_SRC]) == ETH_ALEN]) { > + if (tb[TCA_VLAN_PUSH_ETH_SRC] && > + RTA_PAYLOAD(tb[TCA_VLAN_PUSH_ETH_SRC]) == ETH_ALEN) { > ll_addr_n2a(RTA_DATA(tb[TCA_VLAN_PUSH_ETH_SRC]), > ETH_ALEN, 0, b1, sizeof(b1)); > print_string(PRINT_ANY, "src_mac", " src_mac %s", b1); Fixes: d61167dd88b4 ("m_vlan: add pop_eth and push_eth actions")
Hello: This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <stephen@networkplumber.org>: On Wed, 17 Nov 2021 21:05:33 +0300 you wrote: > Fix the wild bracket in the if clause leading to the error in the condition. > > Signed-off-by: Maxim Petrov <mmrmaximuzz@gmail.com> > --- > tc/m_vlan.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [iproute2] tc/m_vlan: fix print_vlan() conditional on TCA_VLAN_ACT_PUSH_ETH https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=0e949725908b You are awesome, thank you!
diff --git a/tc/m_vlan.c b/tc/m_vlan.c index 221083df..1b2b1d51 100644 --- a/tc/m_vlan.c +++ b/tc/m_vlan.c @@ -279,8 +279,8 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg) ETH_ALEN, 0, b1, sizeof(b1)); print_string(PRINT_ANY, "dst_mac", " dst_mac %s", b1); } - if (tb[TCA_VLAN_PUSH_ETH_SRC && - RTA_PAYLOAD(tb[TCA_VLAN_PUSH_ETH_SRC]) == ETH_ALEN]) { + if (tb[TCA_VLAN_PUSH_ETH_SRC] && + RTA_PAYLOAD(tb[TCA_VLAN_PUSH_ETH_SRC]) == ETH_ALEN) { ll_addr_n2a(RTA_DATA(tb[TCA_VLAN_PUSH_ETH_SRC]), ETH_ALEN, 0, b1, sizeof(b1)); print_string(PRINT_ANY, "src_mac", " src_mac %s", b1);
Fix the wild bracket in the if clause leading to the error in the condition. Signed-off-by: Maxim Petrov <mmrmaximuzz@gmail.com> --- tc/m_vlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)