diff --git a/Makefile b/Makefile index 930bc985..0377dce2 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ CFLAGS+=-Wmissing-prototypes -Wformat -Wall -Wpointer-arith -Wbad-function-cast SRCS=arp.c compile.c main.c genget.c commands.c stats.c kroute.c SRCS+=ctl.c show.c if.c version.c route.c conf.c complete.c ieee80211.c SRCS+=bridge.c tunnel.c media.c sysctl.c passwd.c pfsync.c carp.c -SRCS+=trunk.c who.c timeslot.c more.c stringlist.c utils.c sqlite3.c -SRCS+=ppp.c nopt.c pflow.c +SRCS+=trunk.c who.c more.c stringlist.c utils.c sqlite3.c ppp.c +SRCS+=nopt.c pflow.c CLEANFILES+=compile.c LDADD=-ledit -ltermcap -lsqlite3 -L/usr/local/lib #-static diff --git a/commands.c b/commands.c index 170e36c8..4a9dfbaa 100644 --- a/commands.c +++ b/commands.c @@ -542,7 +542,6 @@ struct intlist Intlist[] = { { "balancing", "CARP balancing mode", CMPL0 0, 0, intcarp }, { "pflow", "pflow data export", CMPL0 0, 0, intpflow }, { "vlan", "802.1Q vlan tag and parent", CMPL0 0, 0, intvlan }, /* XXX bkcompat */ - { "timeslots", "TDM timeslots", CMPL0 0, 0, inttimeslot }, { "debug", "Driver dependent debugging", CMPL0 0, 0, intflags }, { "dhcrelay", "DHCP Relay Agent", CMPL0 0, 0, intdhcrelay }, { "wol", "Wake On LAN", CMPL0 0, 0, intxflags }, diff --git a/conf.c b/conf.c index a6a8b820..f6c00d62 100644 --- a/conf.c +++ b/conf.c @@ -558,9 +558,6 @@ void conf_interfaces(FILE *output, char *only) conf_pflow(output, ifs, ifnp->if_name); conf_mpw(output, ifs, ifnp->if_name); conf_ifxflags(output, ifs, ifnp->if_name); - if (timeslot_status(ifs, ifnp->if_name, tmp, - sizeof(tmp)) == 1) - fprintf(output, " timeslots %s\n", tmp); if (conf_dhcrelay(ifnp->if_name, tmp, sizeof(tmp)) > 0) fprintf(output, " dhcrelay %s\n", tmp); diff --git a/externs.h b/externs.h index 92a50825..91379530 100644 --- a/externs.h +++ b/externs.h @@ -491,10 +491,6 @@ void show_trunk(int ifs, char *ifname); /* who.c */ int who(int, char **); -/* timeslot.c */ -int inttimeslot(char *, int, int, char **); -int timeslot_status(int, char *, char *, int); - /* arp.c */ int arpget(const char *); int arpset(int, char **);