diff options
| author | adrian <adrian@FreeBSD.org> | 2016-02-07 04:28:03 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-02-07 04:28:03 +0000 |
| commit | 370e6e316494079080b3597bc6f38489f41505b9 (patch) | |
| tree | 0cee402aa830941748efba2313b125db41104c38 /tools | |
| parent | 29ef016884d212b509f8947c5112cc7da1c0b6c7 (diff) | |
| download | FreeBSD-src-370e6e316494079080b3597bc6f38489f41505b9.zip FreeBSD-src-370e6e316494079080b3597bc6f38489f41505b9.tar.gz | |
Remove the hard-coded 'ath0' strings and use ATH_DEFAULT.
Remove the duplicate ATH_DEFAULT fields. The build bits should be including
../Makefile.inc as appropriate.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/ath/athaggrstats/main.c | 2 | ||||
| -rw-r--r-- | tools/tools/ath/athdebug/athdebug.c | 4 | ||||
| -rw-r--r-- | tools/tools/ath/athradar/athradar.c | 4 | ||||
| -rw-r--r-- | tools/tools/ath/athratestats/main.c | 2 | ||||
| -rw-r--r-- | tools/tools/ath/athspectral/athspectral.c | 4 | ||||
| -rw-r--r-- | tools/tools/ath/athstats/main.c | 2 |
6 files changed, 5 insertions, 13 deletions
diff --git a/tools/tools/ath/athaggrstats/main.c b/tools/tools/ath/athaggrstats/main.c index 95e7917..6a0de98 100644 --- a/tools/tools/ath/athaggrstats/main.c +++ b/tools/tools/ath/athaggrstats/main.c @@ -89,7 +89,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; wf = athaggrstats_new(ifname, getfmt("default")); while ((c = getopt(argc, argv, "bi:lo:z")) != -1) { switch (c) { diff --git a/tools/tools/ath/athdebug/athdebug.c b/tools/tools/ath/athdebug/athdebug.c index bcdbcc8..b28f043 100644 --- a/tools/tools/ath/athdebug/athdebug.c +++ b/tools/tools/ath/athdebug/athdebug.c @@ -31,7 +31,7 @@ /* * athdebug [-i interface] flags - * (default interface is ath0). + * (default interface is wlan0). */ #include <sys/param.h> @@ -156,7 +156,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; progname = argv[0]; if (argc > 1) { if (strcmp(argv[1], "-i") == 0) { diff --git a/tools/tools/ath/athradar/athradar.c b/tools/tools/ath/athradar/athradar.c index f40e1bd..69f4416 100644 --- a/tools/tools/ath/athradar/athradar.c +++ b/tools/tools/ath/athradar/athradar.c @@ -30,10 +30,6 @@ #include "ah.h" #include "ah_internal.h" -#ifndef ATH_DEFAULT -#define ATH_DEFAULT "ath0" -#endif - #include <getopt.h> #include <errno.h> #include <err.h> diff --git a/tools/tools/ath/athratestats/main.c b/tools/tools/ath/athratestats/main.c index 3881e85..b3f85f7 100644 --- a/tools/tools/ath/athratestats/main.c +++ b/tools/tools/ath/athratestats/main.c @@ -310,7 +310,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; while ((c = getopt(argc, argv, "ahi:m:s:")) != -1) { switch (c) { diff --git a/tools/tools/ath/athspectral/athspectral.c b/tools/tools/ath/athspectral/athspectral.c index 1ec9085..91045d0 100644 --- a/tools/tools/ath/athspectral/athspectral.c +++ b/tools/tools/ath/athspectral/athspectral.c @@ -30,10 +30,6 @@ #include "ah.h" #include "ah_internal.h" -#ifndef ATH_DEFAULT -#define ATH_DEFAULT "ath0" -#endif - #include <getopt.h> #include <errno.h> #include <err.h> diff --git a/tools/tools/ath/athstats/main.c b/tools/tools/ath/athstats/main.c index bf0323d..29e8636 100644 --- a/tools/tools/ath/athstats/main.c +++ b/tools/tools/ath/athstats/main.c @@ -94,7 +94,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; wf = athstats_new(ifname, getfmt("default")); while ((c = getopt(argc, argv, "bi:lo:z")) != -1) { switch (c) { |
