]> git.ipfire.org Git - thirdparty/iptables.git/commit
ebtables: Merge OPT_* flags with xshared ones
authorPhil Sutter <phil@nwl.cc>
Tue, 27 Sep 2022 17:46:47 +0000 (19:46 +0200)
committerPhil Sutter <phil@nwl.cc>
Wed, 28 Sep 2022 12:21:13 +0000 (14:21 +0200)
commitdb420e268735e8499ca16146234ace79a9f1128a
tree936e91a14241535236c2dd72af7269045c2b45f1
parent39cc849ed0f7ae0e5e09e3a2c278708fd36c8c14
ebtables: Merge OPT_* flags with xshared ones

Despite also including xshared.h, xtables-eb.c defined its own OPT_*
flags with clashing values. Albeit ugly, this wasn't a problem in
practice until commit 51d9d9e081344 ("ebtables: Support verbose mode")
which introduced use of OPT_VERBOSE from xshared - with same value as
the local OPT_PROTOCOL define.

Eliminate the clash by appending ebtables-specific flags to the xshared
enum and adjust for the different names of some others.

Fixes: 51d9d9e081344 ("ebtables: Support verbose mode")
Signed-off-by: Phil Sutter <phil@nwl.cc>
iptables/xshared.h
iptables/xtables-eb.c