- trailing commas in enums
- arithmetic on enums needs cast from Anon Ymous
This commit is contained in:
christos
parent
cd84a96731
commit
eda454c1f4
@ -38,7 +38,7 @@ enum ieee80211_phytype {
|
||||
IEEE80211_T_DS, /* direct sequence spread spectrum */
|
||||
IEEE80211_T_FH, /* frequency hopping */
|
||||
IEEE80211_T_OFDM, /* frequency division multiplexing */
|
||||
IEEE80211_T_TURBO, /* high rate OFDM, aka turbo mode */
|
||||
IEEE80211_T_TURBO /* high rate OFDM, aka turbo mode */
|
||||
};
|
||||
#define IEEE80211_T_CCK IEEE80211_T_DS /* more common nomenclature */
|
||||
|
||||
@ -50,9 +50,9 @@ enum ieee80211_phymode {
|
||||
IEEE80211_MODE_11G = 3, /* 2GHz, OFDM */
|
||||
IEEE80211_MODE_FH = 4, /* 2GHz, GFSK */
|
||||
IEEE80211_MODE_TURBO_A = 5, /* 5GHz, OFDM, 2x clock */
|
||||
IEEE80211_MODE_TURBO_G = 6, /* 2GHz, OFDM, 2x clock */
|
||||
IEEE80211_MODE_TURBO_G = 6 /* 2GHz, OFDM, 2x clock */
|
||||
};
|
||||
#define IEEE80211_MODE_MAX (IEEE80211_MODE_TURBO_G+1)
|
||||
#define IEEE80211_MODE_MAX ((int)IEEE80211_MODE_TURBO_G + 1)
|
||||
|
||||
enum ieee80211_opmode {
|
||||
IEEE80211_M_STA = 1, /* infrastructure station */
|
||||
@ -68,7 +68,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 */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -81,7 +81,7 @@ enum ieee80211_authmode {
|
||||
IEEE80211_AUTH_8021X = 3, /* 802.1x */
|
||||
IEEE80211_AUTH_AUTO = 4, /* auto-select/accept */
|
||||
/* NB: these are used only for ioctls */
|
||||
IEEE80211_AUTH_WPA = 5, /* WPA/RSN w/ 802.1x/PSK */
|
||||
IEEE80211_AUTH_WPA = 5 /* WPA/RSN w/ 802.1x/PSK */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -96,7 +96,7 @@ enum ieee80211_authmode {
|
||||
enum ieee80211_roamingmode {
|
||||
IEEE80211_ROAMING_DEVICE= 0, /* driver/hardware control */
|
||||
IEEE80211_ROAMING_AUTO = 1, /* 802.11 layer control */
|
||||
IEEE80211_ROAMING_MANUAL= 2, /* application control */
|
||||
IEEE80211_ROAMING_MANUAL= 2 /* application control */
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ieee80211.h,v 1.18 2007/12/16 13:49:21 degroote Exp $ */
|
||||
/* $NetBSD: ieee80211.h,v 1.19 2008/07/28 17:54:02 christos Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2001 Atsushi Onoe
|
||||
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
|
||||
@ -421,7 +421,7 @@ enum {
|
||||
IEEE80211_ELEMID_HTINFO = 61,
|
||||
IEEE80211_ELEMID_TPC = 150,
|
||||
IEEE80211_ELEMID_CCKM = 156,
|
||||
IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
|
||||
IEEE80211_ELEMID_VENDOR = 221 /* vendor private */
|
||||
};
|
||||
|
||||
struct ieee80211_tim_ie {
|
||||
@ -535,14 +535,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
|
||||
};
|
||||
|
||||
/*
|
||||
@ -584,7 +584,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 */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ieee80211_ioctl.h,v 1.18 2006/03/02 03:38:48 dyoung Exp $ */
|
||||
/* $NetBSD: ieee80211_ioctl.h,v 1.19 2008/07/28 17:54:02 christos Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2001 Atsushi Onoe
|
||||
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
|
||||
@ -300,7 +300,7 @@ enum {
|
||||
IEEE80211_MACCMD_FLUSH = 3, /* flush ACL database */
|
||||
IEEE80211_MACCMD_DETACH = 4, /* detach ACL policy */
|
||||
IEEE80211_MACCMD_POLICY = 5, /* get ACL policy */
|
||||
IEEE80211_MACCMD_LIST = 6, /* get ACL database */
|
||||
IEEE80211_MACCMD_LIST = 6 /* get ACL database */
|
||||
};
|
||||
|
||||
struct ieee80211req_maclist {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ieee80211_proto.h,v 1.16 2006/03/02 03:38:48 dyoung Exp $ */
|
||||
/* $NetBSD: ieee80211_proto.h,v 1.17 2008/07/28 17:54:02 christos Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2001 Atsushi Onoe
|
||||
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
|
||||
@ -44,9 +44,9 @@ 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)
|
||||
#define IEEE80211_S_MAX ((int)IEEE80211_S_RUN + 1)
|
||||
|
||||
#define IEEE80211_SEND_MGMT(_ic,_ni,_type,_arg) \
|
||||
((*(_ic)->ic_send_mgmt)(_ic, _ni, _type, _arg))
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
|
||||
/* $NetBSD: ieee80211_radiotap.h,v 1.18 2007/03/26 21:22:35 dyoung Exp $ */
|
||||
/* $NetBSD: ieee80211_radiotap.h,v 1.19 2008/07/28 17:54:02 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003, 2004 David Young. All rights reserved.
|
||||
@ -199,7 +199,7 @@ enum ieee80211_radiotap_type {
|
||||
IEEE80211_RADIOTAP_TX_FLAGS = 15,
|
||||
IEEE80211_RADIOTAP_RTS_RETRIES = 16,
|
||||
IEEE80211_RADIOTAP_DATA_RETRIES = 17,
|
||||
IEEE80211_RADIOTAP_EXT = 31,
|
||||
IEEE80211_RADIOTAP_EXT = 31
|
||||
};
|
||||
|
||||
#ifndef _KERNEL
|
||||
|
||||
Loading…
Reference in New Issue
Block a user