summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-25 20:40:20 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-25 20:40:20 +0000
commitf7110b5cd727a96dbfdd411aa2e41bc954a83386 (patch)
tree053c33540228487634f8fc3416635db64687b04f /sys
parentdf4a83554378b6461ff16da35349bf36507e7006 (diff)
in real C, there is not , after the last enum entry; ok reyk
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211.h12
-rw-r--r--sys/net80211/ieee80211_proto.h4
-rw-r--r--sys/net80211/ieee80211_radiotap.h4
-rw-r--r--sys/net80211/ieee80211_regdomain.h6
-rw-r--r--sys/net80211/ieee80211_var.h8
5 files changed, 17 insertions, 17 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index c58e06aa7d7..ec01c28db68 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211.h,v 1.4 2004/12/23 12:27:25 jsg Exp $ */
+/* $OpenBSD: ieee80211.h,v 1.5 2004/12/25 20:40:19 deraadt Exp $ */
/* $NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $ */
/*-
@@ -387,7 +387,7 @@ enum {
IEEE80211_ELEMID_XRATES = 50,
IEEE80211_ELEMID_TPC = 150,
IEEE80211_ELEMID_CCKM = 156,
- IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
+ IEEE80211_ELEMID_VENDOR = 221 /* vendor private */
};
#define IEEE80211_CHALLENGE_LEN 128
@@ -452,14 +452,14 @@ typedef u_int8_t *ieee80211_mgt_auth_t;
enum {
IEEE80211_AUTH_OPEN_REQUEST = 1,
- IEEE80211_AUTH_OPEN_RESPONSE = 2,
+ IEEE80211_AUTH_OPEN_RESPONSE = 2
};
enum {
IEEE80211_AUTH_SHARED_REQUEST = 1,
IEEE80211_AUTH_SHARED_CHALLENGE = 2,
IEEE80211_AUTH_SHARED_RESPONSE = 3,
- IEEE80211_AUTH_SHARED_PASS = 4,
+ IEEE80211_AUTH_SHARED_PASS = 4
};
/*
@@ -501,7 +501,7 @@ enum {
IEEE80211_STATUS_TOO_MANY_STATIONS = 22,
IEEE80211_STATUS_RATES = 23,
IEEE80211_STATUS_SHORTSLOT_REQUIRED = 25,
- IEEE80211_STATUS_DSSSOFDM_REQUIRED = 26,
+ IEEE80211_STATUS_DSSSOFDM_REQUIRED = 26
};
#define IEEE80211_WEP_KEYLEN 5 /* 40bit */
@@ -589,7 +589,7 @@ struct ieee80211_duration {
enum {
IEEE80211_AUTH_NONE = 0,
IEEE80211_AUTH_OPEN = 1,
- IEEE80211_AUTH_SHARED = 2,
+ IEEE80211_AUTH_SHARED = 2
};
#endif /* _NET80211_IEEE80211_H_ */
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 3ef2136ee35..fc6427b7d79 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.h,v 1.4 2004/12/23 12:27:25 jsg Exp $ */
+/* $OpenBSD: ieee80211_proto.h,v 1.5 2004/12/25 20:40:19 deraadt Exp $ */
/* $NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $ */
/*-
@@ -46,7 +46,7 @@ enum ieee80211_state {
IEEE80211_S_SCAN = 1, /* scanning */
IEEE80211_S_AUTH = 2, /* try to authenticate */
IEEE80211_S_ASSOC = 3, /* try to assoc */
- IEEE80211_S_RUN = 4, /* associated */
+ IEEE80211_S_RUN = 4 /* associated */
};
#define IEEE80211_S_MAX (IEEE80211_S_RUN+1)
diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h
index 9a1f9252217..64b8317db41 100644
--- a/sys/net80211/ieee80211_radiotap.h
+++ b/sys/net80211/ieee80211_radiotap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_radiotap.h,v 1.2 2004/11/02 02:15:49 reyk Exp $ */
+/* $OpenBSD: ieee80211_radiotap.h,v 1.3 2004/12/25 20:40:19 deraadt Exp $ */
/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.3 2004/04/05 22:13:21 sam Exp $ */
/* $NetBSD: ieee80211_radiotap.h,v 1.9 2004/06/06 04:13:28 dyoung Exp $ */
@@ -180,7 +180,7 @@ enum ieee80211_radiotap_type {
IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
IEEE80211_RADIOTAP_FCS = 14,
- IEEE80211_RADIOTAP_EXT = 31,
+ IEEE80211_RADIOTAP_EXT = 31
};
#ifndef _KERNEL
diff --git a/sys/net80211/ieee80211_regdomain.h b/sys/net80211/ieee80211_regdomain.h
index 69efcdc5f95..c30875c52ff 100644
--- a/sys/net80211/ieee80211_regdomain.h
+++ b/sys/net80211/ieee80211_regdomain.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_regdomain.h,v 1.2 2004/11/06 18:31:41 reyk Exp $ */
+/* $OpenBSD: ieee80211_regdomain.h,v 1.3 2004/12/25 20:40:19 deraadt Exp $ */
/*
* Copyright (c) 2004 Reyk Floeter <reyk@vantronix.net>.
@@ -105,7 +105,7 @@ enum ieee80211_regdomain {
DMN_MKKA = 0xf0200000,
DMN_NULL1 = 0xf0400000,
DMN_WORLD = 0xf0800000,
- DMN_DEBUG = 0xf1000000, /* used for debugging */
+ DMN_DEBUG = 0xf1000000 /* used for debugging */
};
#define IEEE80211_DMN(_d) ((_d) & ~0xf0000000)
@@ -350,7 +350,7 @@ enum ieee80211_countrycode {
CTRY_VIET_NAM = 704, /* Viet Nam */
CTRY_YEMEN = 887, /* Yemen */
CTRY_ZIMBABWE = 716, /* Zimbabwe */
- CTRY_DEBUG = 0x1ff, /* for debugging */
+ CTRY_DEBUG = 0x1ff /* for debugging */
};
struct ieee80211_countryname {
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index a518940c271..8903d3dcebc 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_var.h,v 1.3 2004/12/06 11:15:14 dlg Exp $ */
+/* $OpenBSD: ieee80211_var.h,v 1.4 2004/12/25 20:40:19 deraadt Exp $ */
/* $NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $ */
/*-
@@ -60,7 +60,7 @@ enum ieee80211_phytype {
IEEE80211_T_FH, /* frequency hopping */
IEEE80211_T_OFDM, /* frequency division multiplexing */
IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */
- IEEE80211_T_XR, /* extended range mode */
+ IEEE80211_T_XR /* extended range mode */
};
#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */
@@ -71,7 +71,7 @@ enum ieee80211_phymode {
IEEE80211_MODE_11B = 2, /* 2GHz, CCK */
IEEE80211_MODE_11G = 3, /* 2GHz, OFDM */
IEEE80211_MODE_FH = 4, /* 2GHz, GFSK */
- IEEE80211_MODE_TURBO = 5, /* 5GHz, OFDM, 2x clock */
+ IEEE80211_MODE_TURBO = 5 /* 5GHz, OFDM, 2x clock */
};
#define IEEE80211_MODE_MAX (IEEE80211_MODE_TURBO+1)
@@ -89,7 +89,7 @@ enum ieee80211_opmode {
enum ieee80211_protmode {
IEEE80211_PROT_NONE = 0, /* no protection */
IEEE80211_PROT_CTSONLY = 1, /* CTS to self */
- IEEE80211_PROT_RTSCTS = 2, /* RTS-CTS */
+ IEEE80211_PROT_RTSCTS = 2 /* RTS-CTS */
};
/*