summaryrefslogtreecommitdiffstats
path: root/sbin/ifconfig
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2008-12-15 01:09:01 +0000
committersam <sam@FreeBSD.org>2008-12-15 01:09:01 +0000
commit4cd355eb2dfe0fcc9013eed1f70816aad6dbebf6 (patch)
tree99e51a5128b29e3c07b11010aacccf2d37aa1f4a /sbin/ifconfig
parent0e7403cc3fbe2bd327742c0e10ee2651f4dd97d5 (diff)
downloadFreeBSD-src-4cd355eb2dfe0fcc9013eed1f70816aad6dbebf6.zip
FreeBSD-src-4cd355eb2dfe0fcc9013eed1f70816aad6dbebf6.tar.gz
0 is a potential ISO CC; use new NO_COUNTRY #define to identify
when the CC is not set. Note NO_COUNTRY is set to 0xffff for now (must be 16 bits as ieee80211_regdomain struct defines sku's and cc's as uint16_t which may need fixing).
Diffstat (limited to 'sbin/ifconfig')
-rw-r--r--sbin/ifconfig/ifieee80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 1896fd4..950d3bd 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -425,7 +425,7 @@ setregdomain_cb(int s, void *arg)
struct ieee80211_devcaps_req dc;
struct regdata *rdp = getregdata();
- if (rd->country != 0) {
+ if (rd->country != NO_COUNTRY) {
const struct country *cc;
/*
* Check current country seting to make sure it's
@@ -456,7 +456,7 @@ setregdomain_cb(int s, void *arg)
errx(1, "country %s (%s) is not usable with "
"regdomain %d", cc->isoname, cc->name,
rd->regdomain);
- else if (rp->cc != 0 && rp->cc != cc)
+ else if (rp->cc != NULL && rp->cc != cc)
errx(1, "country %s (%s) is not usable with "
"regdomain %s", cc->isoname, cc->name,
rp->name);
OpenPOWER on IntegriCloud