diff --git a/include/utils.h b/include/utils.h index e8a5467..9151c4f 100644 --- a/include/utils.h +++ b/include/utils.h @@ -25,7 +25,6 @@ extern char * _SL_; extern int max_flush_loops; extern int batch_mode; extern bool do_all; -extern bool require_ifconfig_compat; #ifndef IPPROTO_ESP #define IPPROTO_ESP 50 diff --git a/ip/ip.c b/ip/ip.c index 26f9910..da16b15 100644 --- a/ip/ip.c +++ b/ip/ip.c @@ -37,7 +37,6 @@ int force = 0; int max_flush_loops = 10; int batch_mode = 0; bool do_all = false; -bool require_ifconfig_compat = true; struct rtnl_handle rth = { .fd = -1 }; @@ -247,7 +246,6 @@ int main(int argc, char **argv) exit(0); } else if (matches(opt, "-force") == 0) { ++force; - require_ifconfig_compat = false; } else if (matches(opt, "-batch") == 0) { argc--; argv++; diff --git a/ip/ipaddress.c b/ip/ipaddress.c index a1fa785..99a6ab5 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -1691,7 +1691,7 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv) fprintf(stderr, "Not enough information: \"dev\" argument is required.\n"); return -1; } - if (require_ifconfig_compat && l && matches(d, l) != 0) { + if (l && matches(d, l) != 0) { fprintf(stderr, "\"dev\" (%s) must match \"label\" (%s).\n", d, l); return -1; } diff --git a/man/man8/ip.8 b/man/man8/ip.8 index 3c3512c..016e8c6 100644 --- a/man/man8/ip.8 +++ b/man/man8/ip.8 @@ -54,8 +54,6 @@ First failure will cause termination of ip. Don't terminate ip on errors in batch mode. If there were any errors during execution of the commands, the application return code will be non zero. -This option also allows creation of address labels that may not be backwards compatible with ifconfig. - .TP .BR "\-s" , " \-stats" , " \-statistics" Output more information. If the option