Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 23:09:34 +01:00
Code Releases Activity

wscutil: Rename WSC_CONFIG_STATE to WSC_STATE

Browse Source
This commit is contained in:
Denis Kenzior 2016-08-16 12:29:30 -05:00
parent 0f1372f866
commit 2133a5edb3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wscutil.c
View File

@ -758,7 +758,7 @@ int wsc_parse_beacon(const unsigned char *pdu, unsigned int len,
r = wsc_parse_attrs(pdu, len, &out->version2, &iter, r = wsc_parse_attrs(pdu, len, &out->version2, &iter,
REQUIRED(VERSION, &version), REQUIRED(VERSION, &version),
REQUIRED(WSC_STATE, &out->config_state), REQUIRED(WSC_STATE, &out->state),
OPTIONAL(AP_SETUP_LOCKED, &out->ap_setup_locked), OPTIONAL(AP_SETUP_LOCKED, &out->ap_setup_locked),
OPTIONAL(SELECTED_REGISTRAR, &out->selected_registrar), OPTIONAL(SELECTED_REGISTRAR, &out->selected_registrar),
REGISTRAR(DEVICE_PASSWORD_ID, &out->device_password_id), REGISTRAR(DEVICE_PASSWORD_ID, &out->device_password_id),
@ -810,7 +810,7 @@ int wsc_parse_probe_response(const unsigned char *pdu, unsigned int len,
r = wsc_parse_attrs(pdu, len, &out->version2, &iter, r = wsc_parse_attrs(pdu, len, &out->version2, &iter,
REQUIRED(VERSION, &version), REQUIRED(VERSION, &version),
REQUIRED(WSC_STATE, &out->config_state), REQUIRED(WSC_STATE, &out->state),
OPTIONAL(AP_SETUP_LOCKED, &out->ap_setup_locked), OPTIONAL(AP_SETUP_LOCKED, &out->ap_setup_locked),
OPTIONAL(SELECTED_REGISTRAR, &out->selected_registrar), OPTIONAL(SELECTED_REGISTRAR, &out->selected_registrar),
REGISTRAR(DEVICE_PASSWORD_ID, &out->device_password_id), REGISTRAR(DEVICE_PASSWORD_ID, &out->device_password_id),
@ -926,7 +926,7 @@ int wsc_parse_m1(const uint8_t *pdu, uint32_t len, struct wsc_m1 *out)
REQUIRED(ENCRYPTION_TYPE_FLAGS, &out->encryption_type_flags), REQUIRED(ENCRYPTION_TYPE_FLAGS, &out->encryption_type_flags),
REQUIRED(CONNECTION_TYPE_FLAGS, &out->connection_type_flags), REQUIRED(CONNECTION_TYPE_FLAGS, &out->connection_type_flags),
REQUIRED(CONFIGURATION_METHODS, &out->config_methods), REQUIRED(CONFIGURATION_METHODS, &out->config_methods),
REQUIRED(WSC_STATE, &out->config_state), REQUIRED(WSC_STATE, &out->state),
REQUIRED(MANUFACTURER, &out->manufacturer), REQUIRED(MANUFACTURER, &out->manufacturer),
REQUIRED(MODEL_NAME, &out->model_name), REQUIRED(MODEL_NAME, &out->model_name),
REQUIRED(MODEL_NUMBER, &out->model_number), REQUIRED(MODEL_NUMBER, &out->model_number),

12
src/wscutil.h
View File

@ -253,9 +253,9 @@ enum wsc_rf_band {
}; };
/* Table 45 */ /* Table 45 */
enum wsc_config_state { enum wsc_state {
WSC_CONFIG_STATE_NOT_CONFIGURED = 0x01, WSC_STATE_NOT_CONFIGURED = 0x01,
WSC_CONFIG_STATE_CONFIGURED = 0x02, WSC_STATE_CONFIGURED = 0x02,
}; };
struct wsc_wfa_ext_iter { struct wsc_wfa_ext_iter {
@ -329,7 +329,7 @@ struct wsc_primary_device_type {
struct wsc_beacon { struct wsc_beacon {
bool version2; bool version2;
enum wsc_config_state config_state; enum wsc_state state;
bool ap_setup_locked; bool ap_setup_locked;
bool selected_registrar; bool selected_registrar;
enum wsc_device_password_id device_password_id; enum wsc_device_password_id device_password_id;
@ -342,7 +342,7 @@ struct wsc_beacon {
struct wsc_probe_response { struct wsc_probe_response {
bool version2; bool version2;
enum wsc_config_state config_state; enum wsc_state state;
bool ap_setup_locked; bool ap_setup_locked;
bool selected_registrar; bool selected_registrar;
enum wsc_device_password_id device_password_id; enum wsc_device_password_id device_password_id;
@ -390,7 +390,7 @@ struct wsc_m1 {
uint16_t encryption_type_flags; uint16_t encryption_type_flags;
uint8_t connection_type_flags; uint8_t connection_type_flags;
uint16_t config_methods; uint16_t config_methods;
enum wsc_config_state config_state; enum wsc_state state;
char manufacturer[65]; char manufacturer[65];
char model_name[33]; char model_name[33];
char model_number[33]; char model_number[33];